diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 38e312f1363..7cd96cb68c1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.26168.109 - 3.0.0-preview.3.26168.109 + 11.0.0-beta.26171.106 + 3.0.0-preview.3.26171.106 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7bb17babeb..db53f13b9bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 803eb28628f5623c108f1bf33504c86e19815821 + 840ea139a6e8aebe487f7041190f3865a74378d9 - + https://github.com/dotnet/dotnet - 803eb28628f5623c108f1bf33504c86e19815821 + 840ea139a6e8aebe487f7041190f3865a74378d9 diff --git a/eng/common/core-templates/job/renovate.yml b/eng/common/core-templates/job/renovate.yml index 26b5901819a..ab233539b5d 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 b4812f0f5ad..614455d0ba2 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "11.0.100-preview.3.26161.119" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26168.109" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26171.106" } }