Skip to content

Commit c693a7e

Browse files
Bump to .NET 10.0.100-rc.2 (#4652)
1 parent b9d4710 commit c693a7e

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

.editorconfig

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,14 @@ indent_size = unset
207207
indent_style = unset
208208
insert_final_newline = false
209209
tab_width = unset
210-
trim_trailing_whitespace = false
210+
trim_trailing_whitespace = false
211+
212+
# Disable AOT analyser for test files
213+
[test/**/*.cs]
214+
dotnet_diagnostic.IL2026.severity = none
215+
dotnet_diagnostic.IL2070.severity = none
216+
dotnet_diagnostic.IL2075.severity = none
217+
dotnet_diagnostic.IL2090.severity = none
218+
219+
# This appears to be broken and results in false positives (causing dotnet format to delete valid test scenarios)
220+
dotnet_diagnostic.xUnit1025.severity = none

.github/actions/environment/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ runs:
4444
uses: ./.github/actions/install-zstd
4545

4646
# See https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode
47+
# Also https://github.com/dotnet/macios/issues/21762#issuecomment-3424033859 (don't reference symlinks)
4748
- name: Pin the Xcode Version
4849
if: runner.os == 'macOS'
4950
shell: bash
50-
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
51+
run: sudo xcode-select --switch /Applications/Xcode_26.0.1.app
5152

5253
# Java 17 is needed for Android SDK setup step
5354
- name: Install Java 17
@@ -97,7 +98,7 @@ runs:
9798
dotnet-version: |
9899
8.0.x
99100
9.0.304
100-
10.0.100-rc.1.25451.107
101+
10.0.100-rc.2.25502.107
101102
102103
# .NET 5.0 does not support ARM64 on macOS
103104
- name: Install .NET 5.0 SDK

Directory.Build.props

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
<CurrentTfms>net8.0;net9.0;net10.0</CurrentTfms>
3535
<LatestAndroidTfm>net10.0-android36.0</LatestAndroidTfm>
3636
<PreviousAndroidTfm>net9.0-android35.0</PreviousAndroidTfm>
37-
<LatestIosTfm>net9.0-ios26</LatestIosTfm>
37+
<LatestIosTfm>net10.0-ios26</LatestIosTfm>
3838
<PreviousIosTfm>net9.0-ios18.0</PreviousIosTfm>
39-
<LatestMacCatalystTfm>net9.0-maccatalyst26</LatestMacCatalystTfm>
39+
<LatestMacCatalystTfm>net10.0-maccatalyst26</LatestMacCatalystTfm>
4040
<PreviousMacCatalystTfm>net9.0-maccatalyst18.0</PreviousMacCatalystTfm>
4141
<PreviousWindowsTfm>net9.0-windows10.0.19041.0</PreviousWindowsTfm>
4242
</PropertyGroup>
@@ -114,6 +114,10 @@
114114
<MemoryDumpSupported Condition="!($(PlatformIsLegacy) == 'true' or $(PlatformIsMobile) == 'true')">true</MemoryDumpSupported>
115115

116116
<DefineConstants Condition="'$(MemoryDumpSupported)' == 'true'">$(DefineConstants);MEMORY_DUMP_SUPPORTED</DefineConstants>
117+
118+
<!-- Workaround for this issue https://github.com/dotnet/sdk/issues/51265#issuecomment-3416621522 -->
119+
<RestoreEnablePackagePruning Condition="'$(PlatformIsLegacy)' == 'true' "> false</RestoreEnablePackagePruning>
120+
117121
</PropertyGroup>
118122

119123
<!-- Public key of .assets/Sentry.snk - not a secret. Used by other InternalsVisibleTo entries throughout the solution. -->

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.1.25451.107",
4-
"workloadVersion": "10.0.100-rc.1.25458.2",
3+
"version": "10.0.100-rc.2.25502.107",
4+
"workloadVersion": "10.0.100-rc.2.25513.4",
55
"rollForward": "disable",
66
"allowPrerelease": false
77
}

test/Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<NoWarn>$(NoWarn);IDE1006</NoWarn>
1414
<!-- TODO: Migrate from WebHostBuilder to HostBuilder or WebApplicationBuilder -->
1515
<NoWarn>$(NoWarn);ASPDEPR004;ASPDEPR008</NoWarn>
16+
<!-- Suppress trim/AOT analyzer diagnostics in test projects -->
17+
<NoWarn>$(NoWarn);IL2026;IL2070;IL2075;IL2090</NoWarn>
1618

1719
<!-- Visual tests need net9.0+ mobile and are flaky when using the headless runner on CI -->
1820
<EnableMauiDeviceTestVisualRunner>false</EnableMauiDeviceTestVisualRunner>

0 commit comments

Comments
 (0)