From 6b16de3b5447adbb3ef2d6faa3bc4c20541dc711 Mon Sep 17 00:00:00 2001 From: Nicholas Stevens Date: Sun, 7 May 2023 03:51:52 -0500 Subject: [PATCH] Fixed ILMerge script. --- AngleSharp.DOMParser.nuspec | 2 +- AngleSharp.DOMParser/AngleSharp.DOMParser.csproj | 6 +++--- AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec | 2 +- AngleSharp.DOMParser/Properties/AssemblyInfo.cs | 4 ++-- AngleSharp.DOMParser/build.ps1 | 16 ++++++++-------- appveyor.yml | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/AngleSharp.DOMParser.nuspec b/AngleSharp.DOMParser.nuspec index 2b7c14d..04f8c5c 100644 --- a/AngleSharp.DOMParser.nuspec +++ b/AngleSharp.DOMParser.nuspec @@ -2,7 +2,7 @@ AngleSharp.DOMParser - 1.1.0 + 1.1.2 AngleSharp.DOMParser nstevens1040 false diff --git a/AngleSharp.DOMParser/AngleSharp.DOMParser.csproj b/AngleSharp.DOMParser/AngleSharp.DOMParser.csproj index 7bcb422..f7e6179 100644 --- a/AngleSharp.DOMParser/AngleSharp.DOMParser.csproj +++ b/AngleSharp.DOMParser/AngleSharp.DOMParser.csproj @@ -13,10 +13,10 @@ 512 true html;parser;parse;csharp;dom;powershell;document-object-model;dotnet-framework;windows-powershell;dotnet - 1.1.0 - 1.1.0 + 1.1.2 + 1.1.2 Unlicense - 1.1.0 + 1.1.2 nstevens1040 true diff --git a/AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec b/AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec index 2b7c14d..04f8c5c 100644 --- a/AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec +++ b/AngleSharp.DOMParser/AngleSharp.DOMParser.nuspec @@ -2,7 +2,7 @@ AngleSharp.DOMParser - 1.1.0 + 1.1.2 AngleSharp.DOMParser nstevens1040 false diff --git a/AngleSharp.DOMParser/Properties/AssemblyInfo.cs b/AngleSharp.DOMParser/Properties/AssemblyInfo.cs index 936185e..e3c0a6a 100644 --- 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 index 43a4cac..e4b056d 100644 --- 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 index d3ae95d..0165da5 100644 --- 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 }