diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 4e5b0e471c1565..69be84119be4d9 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -16,6 +16,7 @@ + - + https://github.com/dotnet/cecil - 9e8bd520939ddfee686261267a1646c1b113d9e1 + 2d5c8fb9aa8bd4c7fc085a73520061075c601655 @@ -77,146 +77,146 @@ - + https://github.com/dotnet/source-build-externals - 591e522d15c8c9ffad7c7c1df1ae6a3d392717b4 + 0c377e9585d2aeae504ff1d6529ccb1abef36172 - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf https://github.com/dotnet/llvm-project @@ -302,39 +302,39 @@ https://github.com/dotnet/llvm-project 317598aea216019b6164f599859c738f69595c60 - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/runtime - 5c6d1b3f7b63a3150ce6c737aeb4af03b3cce621 + 29013d8ae50f5bc35427a9155234ccebfa5e227c https://github.com/dotnet/xharness @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness 3119edb6d70fb252e6128b0c7e45d3fc2f49f249 - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + fe17712bedb95a55d5af00c5191772c81393745f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -368,13 +368,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 93bf80f30db2e15a7d62c22ff80fecf3518519b1 - + https://github.com/dotnet/hotreload-utils - 7d2f352486b2e39a7829fc7fefa7d6cf825deff5 + a8ba820e852306e5098dce560629cd98e0eb8a4a - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf https://github.com/dotnet/roslyn @@ -402,15 +402,9 @@ 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/sdk - 13330d5ded0b2b2bcd6459d6a410aa6220b11040 - - - - https://github.com/dotnet/sdk - 13330d5ded0b2b2bcd6459d6a410aa6220b11040 - + 23e2ba847d79562b972dbf54eca3f87c3044d925 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -470,9 +464,9 @@ https://github.com/dotnet/node 703264f70f553a06adfb330378c96f56b7583273 - + https://github.com/dotnet/runtime-assets - 6082ed1bb2cfd2d394cdc0ec613c88f3754041f7 + fc476e8f2d685eb7cadf6342393a0af2708f4dbf diff --git a/eng/Versions.props b/eng/Versions.props index 31865578e84bd8..f60fe49d8f102c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,33 +83,33 @@ 0.2.0 - 10.0.100-alpha.1.24622.2 + 10.0.100-alpha.1.25077.2 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 2.9.2-beta.25058.4 - 10.0.0-beta.25058.4 - 2.9.2-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 - 10.0.0-beta.25058.4 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 2.9.2-beta.25076.1 + 10.0.0-beta.25076.1 + 2.9.2-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 + 10.0.0-beta.25076.1 1.4.0 6.0.0-preview.1.102 - 10.0.0-alpha.1.25057.24 + 10.0.0-alpha.1.25068.1 6.0.0 - 10.0.0-alpha.1.25057.24 + 10.0.0-alpha.1.25068.1 6.0.0 6.0.0 @@ -123,46 +123,46 @@ 5.0.0 4.6.0 4.6.0 - 10.0.0-alpha.1.25057.24 - 10.0.0-alpha.1.25057.24 + 10.0.0-alpha.1.25068.1 + 10.0.0-alpha.1.25068.1 6.0.0 5.0.0 5.0.0 5.0.0 7.0.0 - 10.0.0-alpha.1.25057.24 + 10.0.0-alpha.1.25068.1 6.1.0 7.0.0 4.6.0 4.5.0 - 10.0.0-alpha.1.25057.24 + 10.0.0-alpha.1.25068.1 8.0.0 8.0.4 8.0.0 8.0.0 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 - 10.0.0-beta.25060.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 + 10.0.0-beta.25070.2 10.0.0-prerelease.24610.1 10.0.0-prerelease.24610.1 10.0.0-prerelease.24610.1 - 10.0.0-alpha.0.24627.1 + 10.0.0-alpha.0.25070.1 1.0.0-prerelease.25067.2 1.0.0-prerelease.25067.2 @@ -219,9 +219,9 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.24627.1 + 0.11.5-alpha.25069.2 - 10.0.0-alpha.1.24627.1 + 10.0.0-preview.2.25074.1 2.4.3 9.0.0-alpha.1.24167.3 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 32f79dfb3402c0..feaa6d20812d8f 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -15,16 +15,6 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 04b02f4fd3cc86..80f9130b15087c 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 40485a0f59de16..df203b5178421d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 20e56cc5204710..d459e1b3777469 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "10.0.100-alpha.1.24610.7", + "version": "10.0.100-alpha.1.25077.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-alpha.1.24610.7" + "dotnet": "10.0.100-alpha.1.25077.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25058.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25058.4", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25058.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25076.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25076.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25076.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24" + "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25068.1" } } diff --git a/src/mono/sample/wasm/blazor-frame/blazor.csproj b/src/mono/sample/wasm/blazor-frame/blazor.csproj index 20ff42598cd6a8..86e8e03e032fb9 100644 --- a/src/mono/sample/wasm/blazor-frame/blazor.csproj +++ b/src/mono/sample/wasm/blazor-frame/blazor.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj b/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj index d9067726d9bba1..107122f796b64d 100644 --- a/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj +++ b/src/mono/wasm/testassets/BlazorBasicTestApp/App/BlazorBasicTestApp.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj b/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj index 9ab5da455e2f3a..7d785ff3dc4f8a 100644 --- a/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj +++ b/src/mono/wasm/testassets/BlazorBasicTestApp/RazorClassLibrary/RazorClassLibrary.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj index e873b8660db5ba..7b1b4ec3d34d98 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/AspNetCoreServer/AspNetCoreServer.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj index 6ca0a0f488b8dc..cdf111a973cf9f 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/BlazorClient/BlazorClient.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj index 83e2a274b02d05..8c2bce70138411 100644 --- a/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj +++ b/src/mono/wasm/testassets/WasmOnAspNetCore/Shared/Shared.csproj @@ -11,6 +11,6 @@ - +