Run MSBuild from default install location

devlooped · May 10, 2021 · b9f0d6c · b9f0d6c
1 parent ced5e00
commit b9f0d6c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,17 +47,16 @@ jobs:
           fetch-depth: 0
 
       - name: 🔍 msbuild
-        uses: microsoft/setup-msbuild@v1
-        with:
-          vs-version: '[16.8,)'
+        run: echo "MSBUILD=$(vswhere -property installationPath)\MSBuild\Current\Bin\MSBuild.exe" >> $GITHUB_ENV
 
       - name: 🙏 build
-        run: msbuild -r -m:1
+        run: |
+          "$(MSBUILD)" -r -m:1
 
       - name: 🧪 test
         run: |
           dotnet restore src\NuGetizer.Tests\Scenarios\given_a_packaging_project\a.nuproj
-          msbuild -t:test
+          "$(MSBUILD)" -t:test
 
       - name: 📦 pack
         run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER" -p:RepositoryBranch=${GITHUB_REF#refs/*/}

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,17 +26,16 @@ jobs:
           fetch-depth: 0
 
       - name: 🔍 msbuild
-        uses: microsoft/setup-msbuild@v1
-        with:
-          vs-version: '[16.8,)'
+        run: echo "MSBUILD=$(vswhere -property installationPath)\MSBuild\Current\Bin\MSBuild.exe" >> $GITHUB_ENV
 
       - name: 🙏 build
-        run: msbuild -r -m:1
+        run: |
+          "$(MSBUILD)" -r -m:1
 
       - name: 🧪 test
         run: |
           dotnet restore src\NuGetizer.Tests\Scenarios\given_a_packaging_project\a.nuproj
-          msbuild -t:test
+          "$(MSBUILD)" -t:test
 
       - name: 📦 pack
         run: dotnet pack -m:1 -p:VersionLabel="$GITHUB_REF.$GITHUB_RUN_NUMBER" -p:RepositoryBranch=${GITHUB_REF#refs/*/}