diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba3d11047279c6..939001425a4775 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -84,87 +84,87 @@ - + 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 @@ -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 @@ -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 31865578e84bd8..b389e1926fd175 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,24 +83,24 @@ 0.2.0 - 10.0.100-alpha.1.24622.2 + 10.0.100-alpha.1.25079.6 - 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 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..e4180666f59f18 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.25074.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-alpha.1.24610.7" + "dotnet": "10.0.100-alpha.1.25074.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"