diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 965db360d8c..6f62299ed9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,9 +58,9 @@ - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 @@ -77,9 +77,9 @@ dc3d0694a4b31b8e27038431888cd4e8dd5b6cb6 - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 diff --git a/eng/Versions.props b/eng/Versions.props index 850c6526aa8..5f054df157e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.8.47 + 17.8.48 release 17.7.0 15.1.0.0 @@ -51,7 +51,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.25577.1 + 8.0.0-beta.25605.4 7.0.0 6.0.0 4.8.0-3.23465.5 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 0579e692fc8..8de0dfaf349 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/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: '' diff --git a/global.json b/global.json index a0ec26ee280..6d3a615bcdf 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4" } }