diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b5aa68edf0c5fe..08f05dd27fb6a0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -40,45 +40,45 @@ This file should be imported by eng/Versions.props 19.1.0-alpha.1.25513.1 19.1.0-alpha.1.25513.1 - 5.3.0-1.25523.109 - 5.3.0-1.25523.109 - 5.3.0-1.25523.109 - 10.0.100-rc.2.25523.109 - 10.0.100-rc.2.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 0.11.5-alpha.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 11.0.0-beta.25523.109 - 2.9.3-beta.25523.109 - 2.9.3-beta.25523.109 - 11.0.0-beta.25523.109 - 5.3.0-1.25523.109 - 10.0.0-rc.1.25523.109 - 10.0.100-rc.2.25523.109 - 10.0.0-rc.1.25523.109 - 10.0.0-rc.1.25523.109 - 7.0.0-preview.1.2409 - 7.0.0-preview.1.2409 - 7.0.0-preview.1.2409 - 7.0.0-preview.1.2409 - 10.0.0-rc.1.25523.109 - 2.0.0-rc.1.25523.109 - 10.0.0-rc.1.25523.109 - 10.0.0-rc.1.25523.109 - 10.0.0-rc.1.25523.109 + 5.3.0-1.25528.108 + 5.3.0-1.25528.108 + 5.3.0-1.25528.108 + 10.0.100-rc.2.25528.108 + 10.0.100-rc.2.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 0.11.5-alpha.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 11.0.0-beta.25528.108 + 2.9.3-beta.25528.108 + 2.9.3-beta.25528.108 + 11.0.0-beta.25528.108 + 5.3.0-1.25528.108 + 10.0.0-rc.1.25528.108 + 10.0.100-rc.2.25528.108 + 10.0.0-rc.1.25528.108 + 10.0.0-rc.1.25528.108 + 7.0.0-preview.1.2908 + 7.0.0-preview.1.2908 + 7.0.0-preview.1.2908 + 7.0.0-preview.1.2908 + 10.0.0-rc.1.25528.108 + 2.0.0-rc.1.25528.108 + 10.0.0-rc.1.25528.108 + 10.0.0-rc.1.25528.108 + 10.0.0-rc.1.25528.108 11.0.0-beta.25467.3 11.0.0-beta.25467.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f87ce0c64ca7a..3e3f9ee7c357d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -41,91 +41,91 @@ https://github.com/dotnet/llvm-project 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 https://github.com/dotnet/runtime-assets @@ -263,33 +263,33 @@ https://github.com/dotnet/llvm-project 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness 5b5722171c6c28f6c9f6b6148f148199b9dd0f5b - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets 3f45384563e6b3240d099ba851e9d88992918264 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 - + https://github.com/dotnet/dotnet - c636320f4ab16760a81313f0222af1e4f3740aa9 + e545239117919cda700be149a2e9a032374fc284 https://github.com/dotnet/node diff --git a/eng/Versions.props b/eng/Versions.props index 837341dde90148..32eb6377308ad4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -163,7 +163,9 @@ 3.1.7 1.0.406601 - $(MicrosoftDotNetApiCompatTaskVersion) + + + 10.0.100-rc.2.25502.107 10.0.0-preview.7.25359.101 $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/global.json b/global.json index 6126aaac7cc3fa..6767e8120de23b 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "10.0.100-rc.1.25420.111", + "version": "10.0.100-rc.2.25502.107", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-rc.1.25420.111" + "dotnet": "10.0.100-rc.2.25502.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25523.109", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25523.109", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25523.109", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25528.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25528.108", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25528.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25523.109" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25528.108" } } diff --git a/src/coreclr/tools/ILVerification/ILVerification.csproj b/src/coreclr/tools/ILVerification/ILVerification.csproj index a00727e2482ea3..41c53c4764681c 100644 --- a/src/coreclr/tools/ILVerification/ILVerification.csproj +++ b/src/coreclr/tools/ILVerification/ILVerification.csproj @@ -21,7 +21,4 @@ - - - diff --git a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj index e70e57b309c763..ff674a45771a0e 100644 --- a/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj +++ b/src/libraries/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj @@ -2,6 +2,9 @@ $(NetCoreAppCurrent)-windows;$(NetFrameworkCurrent) + + $(NoWarn);NU1511 diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/harness-helpers.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/harness-helpers.cs index 5d7c80fa1a94e7..7560e3755cf40b 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/harness-helpers.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/k-nucleotide/harness-helpers.cs @@ -25,14 +25,14 @@ public TestHarnessHelpers(bool bigInput, [System.Runtime.CompilerServices.Caller expectedCountLetter = new int[] { 302923, 301375, 198136, 197566 }; expectedCountPairs = new int[] { 91779, 91253, 91225, 90837, 60096, 60030, 59889, 59795, 59756, 59713, 59572, 59557, 39203, 39190, 39081, 39023 }; expectedCountFragments = new int[] { 11765, 3572, 380, 7, 7 }; - resourceName = $"{Path.GetFileNameWithoutExtension(csFileName).Replace('-', '_')}.knucleotide-input-big.txt"; + resourceName = $"{Path.GetFileNameWithoutExtension(csFileName)}.knucleotide-input-big.txt"; } else { expectedCountLetter = new int[] { 1576, 1480, 974, 970 }; expectedCountPairs = new int[] { 496, 480, 470, 420, 316, 315, 310, 302, 298, 292, 273, 272, 202, 201, 185, 167 }; expectedCountFragments = new int[] { 54, 24, 4, 0, 0 }; - resourceName = $"{Path.GetFileNameWithoutExtension(csFileName).Replace('-', '_')}.knucleotide-input.txt"; + resourceName = $"{Path.GetFileNameWithoutExtension(csFileName)}.knucleotide-input.txt"; } expectedFrequencies = new int[][] { expectedCountLetter, expectedCountPairs }; } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/harness-helpers.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/harness-helpers.cs index 6a88cfb68d0e15..a5dc268d1b2e88 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/harness-helpers.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/regex-redux/harness-helpers.cs @@ -20,12 +20,12 @@ public TestHarnessHelpers(bool bigInput, [System.Runtime.CompilerServices.Caller if (bigInput) { ExpectedLength = 136381; - resourceName = $"{Path.GetFileNameWithoutExtension(csFileName).Replace('-', '_')}.regexdna-input25000.txt"; + resourceName = $"{Path.GetFileNameWithoutExtension(csFileName)}.regexdna-input25000.txt"; } else { ExpectedLength = 152; - resourceName = $"{Path.GetFileNameWithoutExtension(csFileName).Replace('-', '_')}.regexdna-input25.txt"; + resourceName = $"{Path.GetFileNameWithoutExtension(csFileName)}.regexdna-input25.txt"; } } diff --git a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/harness-helpers.cs b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/harness-helpers.cs index 7c2082625d6e7a..78532b10f43d4b 100644 --- a/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/harness-helpers.cs +++ b/src/tests/JIT/Performance/CodeQuality/BenchmarksGame/reverse-complement/harness-helpers.cs @@ -22,13 +22,13 @@ public TestHarnessHelpers(bool bigInput, [System.Runtime.CompilerServices.Caller { FileLength = 254245; CheckSum = "61-A4-CC-6D-15-8D-26-77-88-93-4F-E2-29-A2-8D-FB"; - resourceName = $"{Path.GetFileNameWithoutExtension(csFileName).Replace('-', '_')}.revcomp-input25000.txt"; + resourceName = $"{Path.GetFileNameWithoutExtension(csFileName)}.revcomp-input25000.txt"; } else { FileLength = 333; CheckSum = "62-45-8E-09-2E-89-A0-69-8C-17-F5-D8-C7-63-5B-50"; - resourceName = $"{Path.GetFileNameWithoutExtension(csFileName).Replace('-', '_')}.revcomp-input25.txt"; + resourceName = $"{Path.GetFileNameWithoutExtension(csFileName)}.revcomp-input25.txt"; } } diff --git a/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj b/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj index ca8657356dc8b3..f64ea4962f45ed 100644 --- a/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj +++ b/src/tools/illink/test/Mono.Linker.Tests/Mono.Linker.Tests.csproj @@ -10,10 +10,6 @@ - -