Update build files

lgirouard · Nov 11, 2020 · 0bf6c74 · 0bf6c74
1 parent b96bec7
commit 0bf6c74
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
         run: |
           $msbuildPath = Split-Path (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\Current\Bin\amd64\MSBuild.exe | Select-Object -First 1) -Parent
           $env:PATH = $msbuildPath + ';' + $env:PATH
-          .\build.ps1 net
+          .\build.ps1 netframework
           New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
           Compress-Archive -Path dnSpy\dnSpy\bin\Release\net48\* -DestinationPath C:\builtfiles\dnSpy-net48.zip
           .\clean-all.cmd
@@ -41,7 +41,7 @@ jobs:
         run: |
           $msbuildPath = Split-Path (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\Current\Bin\amd64\MSBuild.exe | Select-Object -First 1) -Parent
           $env:PATH = $msbuildPath + ';' + $env:PATH
-          .\build.ps1 core-x86
+          .\build.ps1 net-x86
           New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
           Compress-Archive -Path dnSpy\dnSpy\bin\Release\net5.0-windows\win-x86\publish\* -DestinationPath C:\builtfiles\dnSpy-netcore-win32.zip
           .\clean-all.cmd
@@ -51,7 +51,7 @@ jobs:
         run: |
           $msbuildPath = Split-Path (& "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -requires Microsoft.Component.MSBuild -find MSBuild\Current\Bin\amd64\MSBuild.exe | Select-Object -First 1) -Parent
           $env:PATH = $msbuildPath + ';' + $env:PATH
-          .\build.ps1 core-x64
+          .\build.ps1 net-x64
           New-Item -ItemType Directory -Path C:\builtfiles -Force > $null
           Compress-Archive -Path dnSpy\dnSpy\bin\Release\net5.0-windows\win-x64\publish\* -DestinationPath C:\builtfiles\dnSpy-netcore-win64.zip
           .\clean-all.cmd

diff --git a/build.ps1 b/build.ps1
@@ -67,11 +67,11 @@ function Build-Net {
 	}
 }
 
-$buildNet	  = $buildtfm -eq 'all' -or $buildtfm -eq 'net'
-$buildCoreX86 = $buildtfm -eq 'all' -or $buildtfm -eq 'core-x86'
-$buildCoreX64 = $buildtfm -eq 'all' -or $buildtfm -eq 'core-x64'
+$buildNet	 = $buildtfm -eq 'all' -or $buildtfm -eq 'netframework'
+$buildNetX86 = $buildtfm -eq 'all' -or $buildtfm -eq 'net-x86'
+$buildNetX64 = $buildtfm -eq 'all' -or $buildtfm -eq 'net-x64'
 
-if ($buildCoreX86 -or $buildCoreX64) {
+if ($buildNetX86 -or $buildNetX64) {
 	if ($NoMsbuild) {
 		dotnet build -v:m -c $configuration -f $netframework_tfm $apphostpatcher_dir\AppHostPatcher.csproj
 		if ($LASTEXITCODE) { exit $LASTEXITCODE }
@@ -86,10 +86,10 @@ if ($buildNet) {
 	Build-NetFramework
 }
 
-if ($buildCoreX86) {
+if ($buildNetX86) {
 	Build-Net x86
 }
 
-if ($buildCoreX64) {
+if ($buildNetX64) {
 	Build-Net x64
 }