Re added net46-anycpu build/01-build.ps1

gerardog · Feb 17, 2023 · 01ab586 · 01ab586
1 parent 7b64557
commit 01ab586
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/build/01-build.ps1 b/build/01-build.ps1
@@ -7,9 +7,11 @@ dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\arm64  -f net7
 dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\x64    -f net7.0 -r win-x64   --sc -p:PublishAot=true -p:IlcOptimizationPreference=Size -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
 "-- Building net7.0 win-x86"
 dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\x86    -f net7.0 -r win-x86   --sc -p:PublishReadyToRun=true -p:PublishSingleFile=true -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
-
+"-- Building net4.6 AnyCpu"
+dotnet publish .\src\gsudo\gsudo.csproj -c Release -o .\artifacts\net46-AnyCpu\unmerged -f net46 -p:Platform=AnyCpu -v minimal -p:WarningLevel=0 || $(exit $LASTEXITCODE)
 cp .\src\gsudo.Wrappers\* .\artifacts\x86
 cp .\src\gsudo.Wrappers\* .\artifacts\x64
 cp .\src\gsudo.Wrappers\* .\artifacts\arm64
+cp .\src\gsudo.Wrappers\* .\artifacts\net46-AnyCpu
 
 popd
diff --git a/build/03-sign.ps1 b/build/03-sign.ps1
@@ -30,6 +30,8 @@ $files = @(
 "artifacts\x64\*.p*1" 
 "artifacts\x86\*.exe", 
 "artifacts\x86\*.p*1", 
+"artifacts\net46-AnyCpu\*.exe", 
+"artifacts\net46-AnyCpu\*.p*1",
 "artifacts\arm64\*.exe", 
 "artifacts\arm64\*.p*1"
 ) -join " "

diff --git a/build/04-release-GitHub.ps1 b/build/04-release-GitHub.ps1
@@ -16,7 +16,7 @@ if ($env:version) {
 Get-ChildItem .\artifacts\ -File | Remove-Item                  # Remove files on artifacts root
 Get-ChildItem .\artifacts\ -Filter *.pdb -Recurse | Remove-Item # Remove *.pdb on subfolders
 
-Compress-Archive -Path ./artifacts/x86,./artifacts/x64,./artifacts/arm64 -DestinationPath "artifacts/gsudo.v$($version).zip" -force -CompressionLevel Optimal
+Compress-Archive -Path ./artifacts/x86,./artifacts/x64,./artifacts/arm64,./artifacts/net46-AnyCpu -DestinationPath "artifacts/gsudo.v$($version).zip" -force -CompressionLevel Optimal
 (Get-FileHash artifacts\gsudo.v$($version).zip).hash > artifacts\gsudo.v$($version).zip.sha256
 
 $msbuild = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -prerelease -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe

diff --git a/build/Nuget/gsudo.nuspec.template b/build/Nuget/gsudo.nuspec.template
@@ -50,6 +50,7 @@ Examples
   <files>
     <file src="..\..\artifacts\x64\gsudo.exe" target="x64" />
     <file src="..\..\artifacts\x86\gsudo.exe" target="x86" />
-    <file src="..\..\artifacts\net46-anycpu\gsudo.exe" target="AnyCpu" />
+    <file src="..\..\artifacts\arm64\gsudo.exe" target="Arm64" />
+	<file src="..\..\artifacts\net46-anycpu\gsudo.exe" target="AnyCpu" />
   </files>
 </package>