diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a59044ed90..8e7e84b2a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/arcade - 539e8742ff635bd8b0ae8a7b3a6a02aa60b72c8b + 2e8c949b4e75b05c3a33e848f36cf5b263707338 - + https://github.com/dotnet/arcade - 539e8742ff635bd8b0ae8a7b3a6a02aa60b72c8b + 2e8c949b4e75b05c3a33e848f36cf5b263707338 - + https://github.com/dotnet/arcade - 539e8742ff635bd8b0ae8a7b3a6a02aa60b72c8b + 2e8c949b4e75b05c3a33e848f36cf5b263707338 - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - 834221d3add342b68e0b28deb0bf39fad2a31122 + efaaa147f71871376142f9b77b57be3fe5a7f74b https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index e2a16004f5..2f19b44721 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ preview - 11.0.0-beta.26156.2 - 18.6.0-preview.26162.2 + 11.0.0-beta.26163.2 + 18.6.0-preview.26163.1 4.2.0-preview.26162.7 2.2.0-preview.26162.7 diff --git a/eng/common/core-templates/stages/renovate.yml b/eng/common/core-templates/stages/renovate.yml index 383e397e5d..6844616f49 100644 --- a/eng/common/core-templates/stages/renovate.yml +++ b/eng/common/core-templates/stages/renovate.yml @@ -76,7 +76,7 @@ extends: - stage: Renovate displayName: Run Renovate jobs: - - template: /eng/common/core-templates/job/renovate.yml@self + - template: /eng/common/core-templates/job/renovate.yml parameters: renovateConfigPath: ${{ parameters.renovateConfigPath }} gitHubRepo: ${{ parameters.gitHubRepo }} diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 4f4b56ed2a..76a54e157f 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -73,7 +73,7 @@ steps: # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, # we can avoid including the MB install step if not enabled at all. This avoids a bunch of # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml parameters: enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} microbuildTaskInputs: @@ -95,7 +95,7 @@ steps: condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: - - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml parameters: enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} microbuildTaskInputs: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 01296ee601..e9adff89e9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -295,6 +295,8 @@ function InstallDotNet([string] $dotnetRoot, $dotnetVersionLabel = "'sdk v$version'" + # For performance this check is duplicated in src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs + # if you are making changes here, consider if you need to make changes there as well. if ($runtime -ne '' -and $runtime -ne 'sdk') { $runtimePath = $dotnetRoot $runtimePath = $runtimePath + "\shared" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index edc7b128cf..a564925507 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -184,6 +184,8 @@ function InstallDotNet { local version=$2 local runtime=$4 + # For performance this check is duplicated in src/Microsoft.DotNet.Arcade.Sdk/src/InstallDotNetCore.cs + # if you are making changes here, consider if you need to make changes there as well. local dotnetVersionLabel="'$runtime v$version'" if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then runtimePath="$root" diff --git a/global.json b/global.json index d0a2e5bbcc..8b06724a1c 100644 --- a/global.json +++ b/global.json @@ -37,7 +37,7 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26156.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26163.2", "MSBuild.Sdk.Extras": "3.0.44" } }