From 3c23c99fa045810a9b7abe1ce46e9661f92a2a7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jan 2025 05:02:26 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20250111.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25058.4 -> To Version 10.0.0-beta.25061.1 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 6 +-- 5 files changed, 63 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa757faca821db..b0c8d4e05a1a96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -84,87 +84,87 @@ - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db https://github.com/dotnet/runtime-assets @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness 3119edb6d70fb252e6128b0c7e45d3fc2f49f249 - + https://github.com/dotnet/arcade - e7cb34898a1b610eb2a22591a2178da6f1fb7e3c + 98b4ae348fa01b99dc6fbfc8f601efd9b90090db https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 49c75940b4b650..a96a48f57ff448 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 10.0.100-alpha.1.24622.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.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 2.9.2-beta.25061.1 + 10.0.0-beta.25061.1 + 2.9.2-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 + 10.0.0-beta.25061.1 1.4.0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 04b02f4fd3cc86..853c63849626ac 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -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://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 40485a0f59de16..84ab5f124acc60 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -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://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 20e56cc5204710..958c772ca07086 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "10.0.100-alpha.1.24610.7" }, "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.25061.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25061.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24" From a2b7b97ef7e8fce17b07d489707facd2df18bcbd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Jan 2025 08:52:34 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20250117.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25058.4 -> To Version 10.0.0-beta.25067.3 --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- eng/common/tools.ps1 | 4 +- eng/common/tools.sh | 4 +- global.json | 10 ++--- 5 files changed, 67 insertions(+), 67 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0c8d4e05a1a96..8fb012cc4e5f22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -84,87 +84,87 @@ - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb https://github.com/dotnet/runtime-assets @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness 3119edb6d70fb252e6128b0c7e45d3fc2f49f249 - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index a96a48f57ff448..ce8c1c1c40bc55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 10.0.100-alpha.1.24622.2 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 2.9.2-beta.25061.1 - 10.0.0-beta.25061.1 - 2.9.2-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 2.9.2-beta.25067.3 + 10.0.0-beta.25067.3 + 2.9.2-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 1.4.0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 853c63849626ac..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://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/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 84ab5f124acc60..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://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/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 958c772ca07086..5f60eb128206a1 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "10.0.100-alpha.1.24610.7", + "version": "10.0.100-alpha.1.25064.3", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-alpha.1.24610.7" + "dotnet": "10.0.100-alpha.1.25064.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25061.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25067.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25057.24" From 00d3c57b84c0a71f14bf673cb30325c376fb8275 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Jan 2025 05:01:44 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20250126.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.25058.4 -> To Version 10.0.0-beta.25076.1 --- eng/Version.Details.xml | 84 ++++++++++++++++---------------- eng/Versions.props | 32 ++++++------ eng/common/internal/Tools.csproj | 10 ---- global.json | 10 ++-- 4 files changed, 63 insertions(+), 73 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fb012cc4e5f22..7ffd6ba8da42c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -84,87 +84,87 @@ - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f https://github.com/dotnet/runtime-assets @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness 3119edb6d70fb252e6128b0c7e45d3fc2f49f249 - + https://github.com/dotnet/arcade - 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb + fe17712bedb95a55d5af00c5191772c81393745f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ce8c1c1c40bc55..dc2d778daf72ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 10.0.100-alpha.1.24622.2 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 2.9.2-beta.25067.3 - 10.0.0-beta.25067.3 - 2.9.2-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 - 10.0.0-beta.25067.3 + 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 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/global.json b/global.json index 5f60eb128206a1..e4180666f59f18 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "10.0.100-alpha.1.25064.3", + "version": "10.0.100-alpha.1.25074.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-alpha.1.25064.3" + "dotnet": "10.0.100-alpha.1.25074.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25067.3", + "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" From f1dc4e2ec4c8793c2517c22d3e9d539c008c2f58 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 29 Jan 2025 13:15:43 -0600 Subject: [PATCH 4/4] Update sdk package versions too --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 716ff112bf2108..939001425a4775 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -402,14 +402,14 @@ 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/sdk - 13330d5ded0b2b2bcd6459d6a410aa6220b11040 + b445afaca29f85fa9aee89482a03f06b0c7be810 - + https://github.com/dotnet/sdk - 13330d5ded0b2b2bcd6459d6a410aa6220b11040 + b445afaca29f85fa9aee89482a03f06b0c7be810 diff --git a/eng/Versions.props b/eng/Versions.props index a1a0584fb7ffa3..b389e1926fd175 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,7 +83,7 @@ 0.2.0 - 10.0.100-alpha.1.24622.2 + 10.0.100-alpha.1.25079.6 10.0.0-beta.25076.1 10.0.0-beta.25076.1