Skip to content

Commit 554157f

Browse files
Switch out msbuild
1 parent 3dc2c11 commit 554157f

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

.github/workflows/build-ilspy.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ jobs:
4040
DOTNET_INSTALL_DIR: ${{ runner.temp }}/.dotnet
4141
DOTNET_ROOT: ${{ runner.temp }}/.dotnet
4242

43-
- name: Add msbuild to PATH
44-
uses: microsoft/setup-msbuild@v3
45-
4643
- name: Install dotnet-format
4744
env:
4845
DOTNET_FORMAT_VERSION: 10.0.100-rtm.25531.102
@@ -63,10 +60,10 @@ jobs:
6360
Get-ChildItem Env: | Where-Object {$_.Name -Match "^ILSPY_"} | %{ echo "$($_.Name)=$($_.Value)" } | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
6461
6562
- name: Restore the application
66-
run: msbuild ILSpy.sln /t:Restore /p:RestoreEnablePackagePruning=false /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform
63+
run: dotnet restore ILSpy.sln /p:RestoreEnablePackagePruning=false /p:Configuration=${{ matrix.configuration }} /p:Platform="$env:BuildPlatform"
6764

6865
- name: Build
69-
run: msbuild ILSpy.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=$env:BuildPlatform /m
66+
run: dotnet build ILSpy.sln --no-restore -c ${{ matrix.configuration }} /p:Platform="$env:BuildPlatform" /m
7067

7168
- name: Format check
7269
run: dotnet-format whitespace --verify-no-changes --verbosity detailed ILSpy.sln
@@ -120,15 +117,15 @@ jobs:
120117
- name: Build Installer (x64 and arm64, framework-dependent)
121118
if: matrix.configuration == 'release'
122119
run: |
123-
msbuild ILSpy.Installer.sln /t:Restore /p:Configuration="Release" /p:Platform="Any CPU"
124-
msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU"
125-
msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU" /p:PlatformForInstaller="ARM64"
120+
dotnet msbuild ILSpy.Installer.sln /t:Restore /p:Configuration="Release" /p:Platform="Any CPU"
121+
dotnet msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU"
122+
dotnet msbuild ILSpy.Installer.sln /p:Configuration="Release" /p:Platform="Any CPU" /p:PlatformForInstaller="ARM64"
126123
127124
- name: Build VS Extensions (for 2017-2019 and 2022)
128125
if: matrix.configuration == 'release'
129126
run: |
130-
msbuild ILSpy.VSExtensions.sln /t:Restore /p:Configuration="Release" /p:Platform="Any CPU"
131-
msbuild ILSpy.VSExtensions.sln /p:Configuration="Release" /p:Platform="Any CPU"
127+
dotnet msbuild ILSpy.VSExtensions.sln /t:Restore /p:Configuration="Release" /p:Platform="Any CPU"
128+
dotnet msbuild ILSpy.VSExtensions.sln /p:Configuration="Release" /p:Platform="Any CPU"
132129
133130
# https://github.com/actions/upload-artifact
134131
- name: Upload VSIX (VS 2019) release build artifacts

0 commit comments

Comments
 (0)