Fixed ILMerge script.

nstevens1040 · May 7, 2023 · 6b16de3 · 6b16de3
1 parent 4d32399
commit 6b16de3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/AngleSharp.DOMParser.nuspec b/AngleSharp.DOMParser.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AngleSharp.DOMParser</id>
-    <version>1.1.0</version>
+    <version>1.1.2</version>
     <title>AngleSharp.DOMParser</title>
     <authors>nstevens1040</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/AngleSharp.DOMParser/AngleSharp.DOMParser.csproj b/AngleSharp.DOMParser/AngleSharp.DOMParser.csproj
@@ -13,10 +13,10 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <PackageTags>html;parser;parse;csharp;dom;powershell;document-object-model;dotnet-framework;windows-powershell;dotnet</PackageTags>
-    <AssemblyVersion>1.1.0</AssemblyVersion>
-    <FileVersion>1.1.0</FileVersion>
+    <AssemblyVersion>1.1.2</AssemblyVersion>
+    <FileVersion>1.1.2</FileVersion>
     <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
-    <Version>1.1.0</Version>
+    <Version>1.1.2</Version>
     <Authors>nstevens1040</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>

diff --git a/AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec b/AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AngleSharp.DOMParser</id>
-    <version>1.1.0</version>
+    <version>1.1.2</version>
     <title>AngleSharp.DOMParser</title>
     <authors>nstevens1040</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>

diff --git a/AngleSharp.DOMParser/Properties/AssemblyInfo.cs b/AngleSharp.DOMParser/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.2.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")]
diff --git a/AngleSharp.DOMParser/build.ps1 b/AngleSharp.DOMParser/build.ps1
@@ -31,18 +31,18 @@
     Expand-Archive -Path "$($PWD.Path)\ilmerge.3.0.41.zip" -Destination "$($PWD.Path)\ilmerge.3.0.41"
     $ilmerge = "$($PWD.Path)\ilmerge.3.0.41\tools\net452\ILMerge.exe"
     if(!(Test-Path ".\bin\build" -ea 0)){ $null = mkdir ".\bin\build" }
-    . $ilmerge /lib:.\bin\Debug `
+    . $ilmerge /lib:.\bin\x64\Release `
     /log:.\bin\AngleSharp.DomParser.ILMerge.log `
     /target:library `
     /targetplatform:v4 `
     /out:.\bin\build\AngleSharp.DomParser.dll `
     /keyfile:.\AngleSharp.DOMParser.snk `
-    .\bin\Release\AngleSharp.DOMParser.dll `
-    .\bin\Release\System.Text.Encoding.CodePages.dll `
-    .\bin\Release\AngleSharp.dll `
-    .\bin\Release\System.Buffers.dll `
-    .\bin\Release\System.Memory.dll `
-    .\bin\Release\System.Numerics.Vectors.dll `
-    .\bin\Release\System.Runtime.CompilerServices.Unsafe.dll
+    .\bin\x64\Release\AngleSharp.DOMParser.dll `
+    .\bin\x64\Release\System.Text.Encoding.CodePages.dll `
+    .\bin\x64\Release\AngleSharp.dll `
+    .\bin\x64\Release\System.Buffers.dll `
+    .\bin\x64\Release\System.Memory.dll `
+    .\bin\x64\Release\System.Numerics.Vectors.dll `
+    .\bin\x64\Release\System.Runtime.CompilerServices.Unsafe.dll
     remove-item -Recurse -Force -Path "$($PWD.Path)\ilmerge.3.0.41" -ea 0
     remove-item "$($PWD.Path)\ilmerge.3.0.41.zip" -ea 0
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.1.0
+version: 1.1.2
 image: Visual Studio 2022
 skip_tags: true
 before_build:
@@ -20,12 +20,12 @@ deploy:
     api_key:
       secure: 1fo4bhFuqGYKGzv2VK9P/beOi1S7DxBO+9Wg98pkKiOxNWPE/p4Fb9sPWk3qhLth
   - provider: GitHub
-    tag: v1.1.0
-    release: v1.1.0 stable
+    tag: v1.1.2
+    release: v1.1.2 stable
     description: 'Pushing latest AngleSharp.DOMParser binaries.'
     auth_token:
       secure: ElzOGqa44YRqwJ9jKgjBNDbPEmxb1Mg3I+0TxsPQg8OdUSOA8T8DwkwoKofTXMQT
-    artifact: AngleSharp.DOMParser.1.1.0.zip,AngleSharp.DOMParser-latest.nupkg
+    artifact: AngleSharp.DOMParser.1.1.2.zip,AngleSharp.DOMParser-latest.nupkg
     draft: false
     prerelease: false
 artifacts:
@@ -34,5 +34,5 @@ artifacts:
     type: File
 after_build:
 - ps: >-
-    refreshenv; . 7z.exe a "AngleSharp.DOMParser.1.1.0.zip" .\AngleSharp.DOMParser\bin\build\AngleSharp.DOMParser.dll; Push-AppveyorArtifact "$($PWD.Path)\AngleSharp.DOMParser.1.1.0.zip" -FileName "AngleSharp.DOMParser.1.1.0.zip"; if( @(get-childitem -Recurse -Path "$($ENV:TEMP)" ).Where({$_.Extension -eq ".nupkg" -and $_.Name -match "AngleSharp.DOMParser"}) ){ $nupkg = @(get-childitem -Recurse -Path "$($ENV:TEMP)" ).Where({$_.Extension -eq ".nupkg" -and $_.Name -match "AngleSharp.DOMParser"})[0]; Copy-Item $nupkg.FullName . ; Move-Item -LiteralPath "$($PWD.Path)\$($nupkg.Name)" -Destination "$($PWD.Path)\AngleSharp.DOMParser-latest.nupkg"; Push-AppveyorArtifact "$($PWD.Path)\AngleSharp.DOMParser-latest.nupkg" -FileName "AngleSharp.DOMParser-latest.nupkg" } else { write-host "nupkg not found!" -ForegroundColor Yellow }
+    refreshenv; . 7z.exe a "AngleSharp.DOMParser.1.1.2.zip" .\AngleSharp.DOMParser\bin\build\AngleSharp.DOMParser.dll; Push-AppveyorArtifact "$($PWD.Path)\AngleSharp.DOMParser.1.1.2.zip" -FileName "AngleSharp.DOMParser.1.1.2.zip"; if( @(get-childitem -Recurse -Path "$($ENV:TEMP)" ).Where({$_.Extension -eq ".nupkg" -and $_.Name -match "AngleSharp.DOMParser"}) ){ $nupkg = @(get-childitem -Recurse -Path "$($ENV:TEMP)" ).Where({$_.Extension -eq ".nupkg" -and $_.Name -match "AngleSharp.DOMParser"})[0]; Copy-Item $nupkg.FullName . ; Move-Item -LiteralPath "$($PWD.Path)\$($nupkg.Name)" -Destination "$($PWD.Path)\AngleSharp.DOMParser-latest.nupkg"; Push-AppveyorArtifact "$($PWD.Path)\AngleSharp.DOMParser-latest.nupkg" -FileName "AngleSharp.DOMParser-latest.nupkg" } else { write-host "nupkg not found!" -ForegroundColor Yellow }