Skip to content

Commit 2c75d58

Browse files
bump to .NET 10.0.100 (GA) (#4723)
* update .NET SDK 10.0.100 from RC2 to GA * Removed special handling for musl (until next year) --------- Co-authored-by: James Crosswell <jamescrosswell@users.noreply.github.com>
1 parent 64b0df9 commit 2c75d58

File tree

9 files changed

+24
-26
lines changed

9 files changed

+24
-26
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -265,21 +265,22 @@ jobs:
265265
path: src
266266

267267
- name: Integration test
268-
if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
268+
# # Note that when upgsading .NET versions, linux-musl may need special handling... see comments below
269+
# if: ${{ (matrix.rid != 'linux-musl-x64') && (matrix.rid != 'linux-musl-arm64') }}
269270
uses: getsentry/github-workflows/sentry-cli/integration-test/@a5e409bd5bad4c295201cdcfe862b17c50b29ab7 # v2.14.1
270271
with:
271272
path: integration-test
272273

273-
# For the linux-musl runtimes we have to pin the ContainerBaseImage for preview or RC builds, since
274-
# these don't conform to the normal naming conventions and don't get resolved automatically. We do
275-
# by passing it as parameter to aot.Tests.ps1 via an environment variable
276-
- name: Integration test (musl)
277-
if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
278-
uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
279-
env:
280-
ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
281-
with:
282-
path: integration-test
274+
# # For the linux-musl runtimes we have to pin the ContainerBaseImage for preview or RC builds, since
275+
# # these don't conform to the normal naming conventions and don't get resolved automatically. We do
276+
# # by passing it as parameter to aot.Tests.ps1 via an environment variable
277+
# - name: Integration test (musl)
278+
# if: ${{ (matrix.rid == 'linux-musl-x64') || (matrix.rid == 'linux-musl-arm64') }}
279+
# uses: getsentry/github-workflows/sentry-cli/integration-test/@v2
280+
# env:
281+
# ContainerBaseImage: 'mcr.microsoft.com/dotnet/nightly/runtime-deps:10.0-preview-alpine3.22'
282+
# with:
283+
# path: integration-test
283284

284285
ms-build:
285286
needs: build-sentry-native

Directory.Build.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<!-- We need to support old stuff. Applications should definitely address these advisory warnings though. -->
2222
<NoWarn>$(NoWarn);NU1902;NU1903</NoWarn>
2323

24-
<!-- For Xcode 26 support in .NET 10 -->
25-
<NoWarn>$(NoWarn);XCODE_26_0_PREVIEW</NoWarn>
26-
2724
<!-- https://learn.microsoft.com/en-us/dotnet/core/compatibility/sdk/8.0/dotnet-restore-audit#version-introduced -->
2825
<WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
2926

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.2.25502.107",
4-
"workloadVersion": "10.0.100-rc.2.25513.4",
3+
"version": "10.0.100",
4+
"workloadVersion": "10.0.100",
55
"rollForward": "disable",
66
"allowPrerelease": false
77
}

src/Sentry.AspNetCore.Blazor.WebAssembly/Sentry.AspNetCore.Blazor.WebAssembly.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</ItemGroup>
2020

2121
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
22-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.1.25451.107" />
22+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
2323
</ItemGroup>
2424

2525
</Project>

src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
</ItemGroup>
3434

3535
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
36-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.1.25451.107" />
37-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0-rc.1.25451.107" />
38-
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0-rc.1.25451.107" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="10.0.0" />
38+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
3939
</ItemGroup>
4040

4141
<ItemGroup>

test/Sentry.AspNetCore.Grpc.Tests/Sentry.AspNetCore.Grpc.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</ItemGroup>
1313

1414
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
15-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
15+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<ItemGroup Condition="$(TargetFramework) == 'net10.0'">
6161
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="5.1.0" />
62-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
62+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
6363
<PackageReference Include="Verify.AspNetCore" Version="4.2.0" />
6464
<PackageReference Include="Verify.Http" Version="7.0.0" />
6565
</ItemGroup>

test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<!-- Test EF Core 10 on .NET 10 -->
1010
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
1111
<PackageReference Include="Verify.EntityFramework" Version="9.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
1414
</ItemGroup>
1515

1616
<!-- Test EF Core 9 on .NET 9 -->

test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
<!-- Test EF Core 10 on .NET 10 -->
1010
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
11-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0-rc.1.25451.107" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.1.25451.107" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
1313
</ItemGroup>
1414

1515
<!-- Test EF Core 9 on .NET 9 -->

0 commit comments

Comments
 (0)