Alternate solution to inject the ContainerBaseImage

Author: jamescrosswell

.github/workflows/build.yml

@@ -264,13 +264,23 @@ jobs:
           path: src
 
       - name: Integration test
+        if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
+        uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
+        with:
+          path: integration-test
+
+      # For the linux-musl runtimes we have to pin the ContainerBaseImage for preview or RC builds, since
+      # these don't conform to the normal naming conventions and don't get resolved automatically. We do 
+      # by passing it as parameter to aot.Tests.ps1 via an environment variable
+      - name: Integration test (musl)
+        if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
         uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
         env:
-          RuntimeIdentifier: ${{ matrix.rid }}
+          ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
         with:
           path: integration-test
 
-  msbuild:
+  ms-build:
     needs: build-sentry-native
     name: MSBuild
     runs-on: windows-latest

integration-test/aot.Tests.ps1

@@ -31,19 +31,6 @@ Describe 'Publish' {
         Write-Host "::group::Create test project"
         dotnet new console --aot --name hello-sentry --output . | Write-Host
         dotnet add package Sentry --prerelease --source $localPackages | Write-Host
-
-        # Pin the ContainerBaseImage on linux-musl... otherwise the .NET 10 preview7 can't find it
-        $projPath = Join-Path (Get-Location) 'hello-sentry.csproj'
-        [xml]$proj = Get-Content $projPath
-        $pg = $proj.CreateElement('PropertyGroup')
-        $pg.SetAttribute('Condition', '$([System.String]::new(''$(RuntimeIdentifier)'').StartsWith(''linux-musl''))')
-        $cbi = $proj.CreateElement('ContainerBaseImage')
-        $cbi.InnerText = 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
-        $pg.AppendChild($cbi) | Out-Null
-        $proj.Project.AppendChild($pg) | Out-Null
-        $proj.Save($projPath)
-
-        # Minimal Program.cs
         @"
 SentrySdk.Init(options =>
 {
@@ -64,21 +51,21 @@ Console.WriteLine("Hello, Sentry!");
 
     It 'Aot' {
         $rid = $env:RuntimeIdentifier
-        if ($rid)
-        {
+        $baseImage = $env:ContainerBaseImage
+        $publishArgs = @('-c', 'Release')
+        if ($rid) {
             Write-Host "Environment RuntimeIdentifier: $rid"
-            dotnet publish -c Release -r $rid | Write-Host
+            $publishArgs += @('-r', $rid)
         }
-        else
-        {
-            Write-Host "Implicit RuntimeIdentifier"
-            dotnet publish -c Release | Write-Host
+        if ($baseImage) {
+            Write-Host "Using ContainerBaseImage: $baseImage"
+            $publishArgs += "-p:ContainerBaseImage=$baseImage"
         }
+        dotnet publish @publishArgs | Write-Host
         $LASTEXITCODE | Should -Be 0
 
         $tfm = (Get-ChildItem -Path "bin/Release" -Directory | Select-Object -First 1).Name
-        if (-not $rid)
-        {
+        if (-not $rid) {
             $rid = (Get-ChildItem -Path "bin/Release/$tfm" -Directory | Select-Object -First 1).Name
         }
         & "bin/Release/$tfm/$rid/publish/hello-sentry" | Write-Host