diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91ce1ed20d..22871208ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 3290ea9c86a58d83fb56e43865295b44f68fb11b + edfa48ec6f9e7e8677bf2a7382dd32309d3f1ef3 - + https://github.com/dotnet/arcade - 3290ea9c86a58d83fb56e43865295b44f68fb11b + edfa48ec6f9e7e8677bf2a7382dd32309d3f1ef3 - + https://github.com/dotnet/arcade - 3290ea9c86a58d83fb56e43865295b44f68fb11b + edfa48ec6f9e7e8677bf2a7382dd32309d3f1ef3 https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage diff --git a/eng/Versions.props b/eng/Versions.props index a9b412cfe7..ea4e9c7ae0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ preview - 11.0.0-beta.26167.2 + 11.0.0-beta.26169.3 18.6.0-preview.26166.2 4.2.0-preview.26163.4 diff --git a/eng/common/core-templates/job/renovate.yml b/eng/common/core-templates/job/renovate.yml index 26b5901819..ab233539b5 100644 --- a/eng/common/core-templates/job/renovate.yml +++ b/eng/common/core-templates/job/renovate.yml @@ -96,6 +96,9 @@ jobs: - name: renovateVersion value: '42' readonly: true + - name: renovateLogFilePath + value: '$(Build.ArtifactStagingDirectory)/renovate.json' + readonly: true - name: dryRunArg readonly: true ${{ if eq(parameters.dryRun, true) }}: @@ -175,13 +178,13 @@ jobs: RENOVATE_RECREATE_WHEN: $(recreateWhenArg) LOG_LEVEL: info LOG_FILE_LEVEL: debug - LOG_FILE: $(Build.ArtifactStagingDirectory)/renovate.json + LOG_FILE: $(renovateLogFilePath) RENOVATE_CONFIG_FILE: $(selfRepoPath)/${{parameters.renovateConfigPath}} - script: | echo "PRs created by Renovate:" - if [ -s "$(Build.ArtifactStagingDirectory)/renovate.json" ]; then - if ! jq -r 'select(.msg == "PR created" and .pr != null) | "https://github.com/\(.repository)/pull/\(.pr)"' "$(Build.ArtifactStagingDirectory)/renovate-log.json" | sort -u; then + if [ -s "$(renovateLogFilePath)" ]; then + if ! jq -r 'select(.msg == "PR created" and .pr != null) | "https://github.com/\(.repository)/pull/\(.pr)"' "$(renovateLogFilePath)" | sort -u; then echo "##vso[task.logissue type=warning]Failed to parse Renovate log file with jq." echo "##vso[task.complete result=SucceededWithIssues]" fi diff --git a/global.json b/global.json index 3d6081b183..fab97baaf2 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.26167.2", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26169.3", "MSBuild.Sdk.Extras": "3.0.44" } }