diff --git a/NuGet.config b/NuGet.config index b54346af7739..06447aaa9df3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,26 +4,22 @@ - - - - @@ -50,17 +46,14 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ff52fa79eee..6a4405b83bc9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - f95859accbb8e8312e39c1dcd7d1639c4d2c0c51 + 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 - + https://github.com/dotnet/arcade - f95859accbb8e8312e39c1dcd7d1639c4d2c0c51 + 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 - + https://github.com/dotnet/arcade - f95859accbb8e8312e39c1dcd7d1639c4d2c0c51 + 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 - + https://github.com/dotnet/arcade - f95859accbb8e8312e39c1dcd7d1639c4d2c0c51 + 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index dec4e96413a1..74ec8ffed449 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25574.4 + 8.0.0-beta.25577.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25574.4 + 8.0.0-beta.25577.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index b63043da4b9f..c307825c9122 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ae06b26ea373..d08a0e92caa4 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 76e639598408..d6118b41c79a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -960,4 +960,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} +} \ No newline at end of file diff --git a/global.json b/global.json index 8b61223b70e6..0d6140e41e91 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25574.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25574.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25577.1" } }