diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3e14ccf55e..1821dfebd3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -265,21 +265,22 @@ jobs: path: src - name: Integration test - if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }} +# # Note that when upgsading .NET versions, linux-musl may need special handling... see comments below +# if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }} uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1 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: - ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22' - 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: +# ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22' +# with: +# path: integration-test ms-build: needs: build-sentry-native diff --git a/Directory.Build.props b/Directory.Build.props index 92b7d9f7a9..093b687c47 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,9 +21,6 @@ $(NoWarn);NU1902;NU1903 - - $(NoWarn);XCODE_26_0_PREVIEW - NU1902;NU1903 diff --git a/global.json b/global.json index f260fed215..be464523b1 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", - "workloadVersion": "10.0.100-rc.2.25513.4", + "version": "10.0.100", + "workloadVersion": "10.0.100", "rollForward": "disable", "allowPrerelease": false } diff --git a/src/Sentry.AspNetCore.Blazor.WebAssembly/Sentry.AspNetCore.Blazor.WebAssembly.csproj b/src/Sentry.AspNetCore.Blazor.WebAssembly/Sentry.AspNetCore.Blazor.WebAssembly.csproj index 61d6dd2229..b0635091c6 100644 --- a/src/Sentry.AspNetCore.Blazor.WebAssembly/Sentry.AspNetCore.Blazor.WebAssembly.csproj +++ b/src/Sentry.AspNetCore.Blazor.WebAssembly/Sentry.AspNetCore.Blazor.WebAssembly.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj b/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj index 4201207da5..d26cc963e2 100644 --- a/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj +++ b/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj @@ -33,9 +33,9 @@ - - - + + + diff --git a/test/Sentry.AspNetCore.Grpc.Tests/Sentry.AspNetCore.Grpc.Tests.csproj b/test/Sentry.AspNetCore.Grpc.Tests/Sentry.AspNetCore.Grpc.Tests.csproj index 57dd94d734..cebd392dce 100644 --- a/test/Sentry.AspNetCore.Grpc.Tests/Sentry.AspNetCore.Grpc.Tests.csproj +++ b/test/Sentry.AspNetCore.Grpc.Tests/Sentry.AspNetCore.Grpc.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj b/test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj index fba06619e4..6c6d98ec6b 100644 --- a/test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj +++ b/test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj @@ -59,7 +59,7 @@ - + diff --git a/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj b/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj index 62d67cadbb..6356d86783 100644 --- a/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj +++ b/test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj b/test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj index 93ad42e99b..5edda61ce8 100644 --- a/test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj +++ b/test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj @@ -8,8 +8,8 @@ - - + +