diff --git a/NuGet.config b/NuGet.config
index ce4bddaa76d..b1922c34161 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,6 @@
-
@@ -25,7 +24,6 @@
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 70702141332..f8bdf32fba3 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
https://github.com/dotnet/arcade
- 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80
+ 92e45d251889042fd956e18b28d489020298d864
-
+
https://github.com/dotnet/arcade
- 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80
+ 92e45d251889042fd956e18b28d489020298d864
-
+
https://github.com/dotnet/arcade
- 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80
+ 92e45d251889042fd956e18b28d489020298d864
-
+
https://github.com/dotnet/arcade
- 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80
+ 92e45d251889042fd956e18b28d489020298d864
-
+
https://github.com/dotnet/arcade
- 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80
+ 92e45d251889042fd956e18b28d489020298d864
-
+
https://github.com/dotnet/arcade
- 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80
+ 92e45d251889042fd956e18b28d489020298d864
diff --git a/eng/Versions.props b/eng/Versions.props
index 15d059eb0e4..74a80992c2e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,9 +57,9 @@
- 9.0.0-beta.25562.4
- 9.0.0-beta.25562.4
- 9.0.0-beta.25562.4
+ 9.0.0-beta.25608.5
+ 9.0.0-beta.25608.5
+ 9.0.0-beta.25608.5
17.4.0-preview-20220707-01
diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml
index 5baedac1e03..1037ccedcb5 100644
--- a/eng/common/core-templates/job/source-build.yml
+++ b/eng/common/core-templates/job/source-build.yml
@@ -65,7 +65,7 @@ jobs:
demands: ImageOverride -equals build.ubuntu.2004.amd64
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
- image: 1es-mariner-2
+ image: 1es-azurelinux-3
os: linux
${{ else }}:
pool:
diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml
index 662b9fcce15..ddf8c2e00d8 100644
--- a/eng/common/core-templates/job/source-index-stage1.yml
+++ b/eng/common/core-templates/job/source-index-stage1.yml
@@ -6,7 +6,7 @@ parameters:
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
- condition: ''
+ condition: eq(variables['Build.SourceBranch'], 'refs/heads/main')
dependsOn: ''
pool: ''
is1ESPipeline: ''
diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml
index 0718e4ba902..7846584d2a7 100644
--- a/eng/common/core-templates/steps/source-build.yml
+++ b/eng/common/core-templates/steps/source-build.yml
@@ -41,7 +41,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/global.json b/global.json
index e2f7221968c..799200a5f13 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "9.0.112"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25562.4",
- "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25562.4",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25562.4",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5",
+ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25608.5",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "9.0.11"
},