Try dotnet msbuild

Author: jpnurmi

.github/workflows/build.yml

@@ -293,6 +293,11 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/environment
 
+      - name: Install .NET 5.0 SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '5.0.x'
+
       - name: Build Native Dependencies
         uses: ./.github/actions/buildnative
 
@@ -303,6 +308,11 @@ jobs:
         id: msbuild
         run: msbuild Sentry-CI-Build-Windows.slnf -t:Restore,Build,Pack -p:Configuration=Release --nologo -v:minimal -flp:logfile=msbuild.log -p:CopyLocalLockFileAssemblies=true -bl:msbuild.binlog
 
+      - name: Test MSBuild
+        uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
+        with:
+          path: integration-test/msbuild.Tests.ps1
+
       - name: Upload logs
         if: ${{ always() }}
         uses: actions/upload-artifact@v4
@@ -313,65 +323,6 @@ jobs:
             msbuild.binlog
           if-no-files-found: ignore
 
-      - name: Archive NuGet Packages
-        uses: actions/upload-artifact@v4
-        with:
-          name: msbuild-${{ github.sha }}
-          if-no-files-found: error
-          path: |
-            src/**/Release/*.nupkg
-            src/**/Release/*.snupkg
-
-  msbuild-test:
-    needs: msbuild-sentry
-    name: MSBuild Test (${{ matrix.name }})
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - name: VS 2022
-          - name: VS 2019
-            dotnet-version: '5.0.x'
-            vs-build-tools: 2019
-            vs-version: '[16.0,17.0)'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-        with:
-          submodules: recursive
-
-      - name: Setup Environment
-        if: ${{ !matrix.dotnet-version }}
-        uses: ./.github/actions/environment
-
-      - name: Install .NET SDK
-        if: ${{ matrix.dotnet-version }}
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: ${{ matrix.dotnet-version }}
-
-      - name: Install VS Build Tools
-        if: ${{ matrix.vs-build-tools }}
-        run: choco install visualstudio${{ matrix.vs-build-tools }}buildtools
-
-      - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
-        with:
-          vs-version: ${{ matrix.vs-version }}
-
-      - name: Fetch NuGet Packages
-        uses: actions/download-artifact@v5
-        with:
-          name: msbuild-${{ github.sha }}
-          path: src
-
-      - name: Run MSBuild tests
-        uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
-        with:
-          path: integration-test/msbuild.Tests.ps1
-
   # Unsupported Native AOT runtimes should have SentryNative auto-disabled
   # to avoid native library loading errors on startup.
   unsupported-aot:

integration-test/msbuild.Tests.ps1

@@ -3,19 +3,31 @@ Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 . $PSScriptRoot/common.ps1
 
-$HasMSBuild = (Get-Command msbuild -ErrorAction SilentlyContinue)
-
 Describe 'MSBuild app (<framework>)' -ForEach @(
-    @{ framework = 'net5.0'; msbuild = '16' },
-    @{ framework = 'net8.0' },
-    @{ framework = 'net9.0' }
-) -Skip:(-not $IsWindows -or -not $HasMSBuild) {
+    @{ framework = 'net5.0'; sdk = '5.0.400' },
+    @{ framework = 'net8.0'; sdk = '8.0.400' },
+    @{ framework = 'net9.0'; sdk = '9.0.300' }
+) -Skip:(-not $IsWindows) {
     BeforeAll {
-        $path = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName())
-        Set-Location $path # temp cwd to avoid global.json
+        $tempDir = Join-Path ([System.IO.Path]::GetTempPath()) ([System.IO.Path]::GetRandomFileName())
+        New-Item -ItemType Directory -Path $tempDir | Out-Null
+        Push-Location $tempDir
+        @"
+{
+        "sdk": {
+                "version": "$sdk",
+                "rollForward": "latestFeature"
+        }
+}
+"@ | Out-File global.json
 
-        $path = Join-Path $path 'msbuild-app'
-        DotnetNew 'console' $path $framework
+        dotnet --version | ForEach-Object { Write-Host $_ }
+        dotnet msbuild -version | ForEach-Object { Write-Host $_ }
+        $hasDotnetSdk = $LASTEXITCODE -eq 0
+
+        if ($hasDotnetSdk) {
+            DotnetNew 'console' $tempDir/msbuild-app $framework
+            Set-Location $tempDir/msbuild-app
         @'
 using Sentry;
 
@@ -26,49 +38,28 @@ SentrySdk.Init(options =>
 });
 
 SentrySdk.CaptureMessage("Hello from MSBuild app");
-'@ | Out-File $path/Program.cs
-
-        Set-Location $path
-
-        function Test-NetSdk([string]$framework) {
-            $version = $framework -replace 'net(\d+)\.0', '$1'
-            $sdks = dotnet --list-sdks
-            return $null -ne ($sdks | Where-Object { $_ -match "^$version\." })
-        }
-
-        function Test-MSBuild([string]$version) {
-            $output = & msbuild -version 2>&1 | Select-Object -Last 1
-            return $output -match "^$version\."
+'@ | Out-File Program.cs
         }
     }
 
-    BeforeEach {
-        Remove-Item "./bin/Release/$framework" -Recurse -ErrorAction SilentlyContinue
-        Remove-Item "./obj/Release/$framework" -Recurse -ErrorAction SilentlyContinue
-    }
-
     AfterAll {
         Pop-Location
+        Remove-Item -Recurse -Force $tempDir
     }
 
     It 'builds without warnings and is able to capture a message' {
-        if (-not (Test-NetSdk $framework)) {
+        if (-not $hasDotnetSdk) {
             Set-ItResult -Skipped -Because "$framework is not installed"
         }
-        if ($msbuild -and -not (Test-MSBuild $msbuild)) {
-            Set-ItResult -Skipped -Because "MSBuild $msbuild is not installed"
-        }
+        # TODO: pass -p:TreatWarningsAsErrors=true after #4554 is fixed
+        dotnet msbuild msbuild-app.csproj -t:Restore,Build -p:Configuration=Release -p:TreatWarningsAsErrors=false
+        | ForEach-Object { Write-Host $_ }
+        $LASTEXITCODE | Should -Be 0
 
         $result = Invoke-SentryServer {
             Param([string]$url)
             $dsn = $url.Replace('http://', 'http://key@') + '/0'
-
-            # TODO: pass -p:TreatWarningsAsErrors=true after #4554 is fixed
-            msbuild msbuild-app.csproj -t:Restore,Build -p:Configuration=Release -p:TreatWarningsAsErrors=false
-            | ForEach-Object { Write-Host $_ }
-            $LASTEXITCODE | Should -Be 0
-
-            msbuild msbuild-app.csproj -t:Run -p:Configuration=Release -p:RunArguments=$dsn
+            dotnet msbuild msbuild-app.csproj -t:Run -p:Configuration=Release -p:RunArguments=$dsn
             | ForEach-Object { Write-Host $_ }
             $LASTEXITCODE | Should -Be 0
         }