diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8da88cd45..81a9a4dc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 91db46836065516e87e05bbdb51c5aee0f90428c + c670c5bf5cff7c5c2ca086fd41cc1ace90761576 - + https://github.com/dotnet/arcade - 91db46836065516e87e05bbdb51c5aee0f90428c + c670c5bf5cff7c5c2ca086fd41cc1ace90761576 - + https://github.com/dotnet/arcade - 91db46836065516e87e05bbdb51c5aee0f90428c + c670c5bf5cff7c5c2ca086fd41cc1ace90761576 https://github.com/dotnet/arcade-services @@ -220,14 +220,14 @@ 1f8037df094f11e7ab0422cbe514726ccc920d78 - + https://github.com/dotnet/sourcelink - 4d2cae3ec4edec7004c6e46cd6d1621966bf776d + 2fc6877be8977fdfdaedbf8dbb1937e85a9c1c0c - + https://github.com/dotnet/xliff-tasks - 1fc529f2ba048ce0534cb1fa90fc1b7b89f3c668 + e1e30629021d58cfda76452755b75c89d6e307a8 diff --git a/eng/Versions.props b/eng/Versions.props index 52e8c1af8..2bcc023be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.22462.4 + 8.0.0-beta.22463.5 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a6..781a41c94 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -59,7 +59,9 @@ jobs: - checkout: self clean: true - - template: /eng/common/templates/post-build/setup-maestro-vars.yml + # If the template caller didn't provide an AzDO parameter, set them all up as Maestro vars. + - ${{ if not(and(parameters.AzDOProjectName, parameters.AzDOPipelineId, parameters.AzDOBuildId)) }}: + - template: /eng/common/templates/post-build/setup-maestro-vars.yml - ${{ if ne(parameters.downloadArtifacts, 'false')}}: - ${{ if ne(parameters.artifactNames, '') }}: diff --git a/global.json b/global.json index 3ac67aebb..98eed4d6f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22462.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22462.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22463.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.22463.5" } }