From bc4c73ef157c92e5cf40e84ff8dfbc3e080ba265 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Aug 2022 12:20:28 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/runtime build 20220731.5 Microsoft.NETCore.App.Runtime.win-x64 , VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22380.3 -> To Version 7.0.0-rc.1.22381.5 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20dbb5881f..ce275c7792 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,13 +40,13 @@ https://github.com/dotnet/aspnetcore a85675d5da8e42909f0ece7e70df9af35615707d - + https://github.com/dotnet/runtime - 17a4eca42337109c4f916a023d97df12b50b5d59 + 508fef51e841aa16ffed1aae32bf4793a2cea363 - + https://github.com/dotnet/runtime - 17a4eca42337109c4f916a023d97df12b50b5d59 + 508fef51e841aa16ffed1aae32bf4793a2cea363 diff --git a/eng/Versions.props b/eng/Versions.props index b14f1f2020..ec32533fa2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,8 +18,8 @@ 1.0.337501 - 7.0.0-rc.1.22380.3 - 7.0.0-rc.1.22380.3 + 7.0.0-rc.1.22381.5 + 7.0.0-rc.1.22381.5 7.0.0-rc.1.22380.2 7.0.0-rc.1.22380.2 From 84f900112461a3159c7d032384ce6d35c586b253 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Mon, 1 Aug 2022 10:28:11 -0700 Subject: [PATCH 2/3] Update MacOS vm image from macOS-10.15 to macOS-latest --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index cdca2e0e53..8f35c9eef8 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -48,7 +48,7 @@ jobs: # Build OSX Pool (we don't have on-prem OSX BuildPool) ${{ if in(parameters.osGroup, 'MacOS', 'MacOS_cross') }}: - vmImage: macOS-10.15 + vmImage: macOS-latest # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: From 195d8d11db5a7a777555878257052e1cf69a5069 Mon Sep 17 00:00:00 2001 From: Juan Hoyos Date: Mon, 1 Aug 2022 11:53:25 -0700 Subject: [PATCH 3/3] Stop using XCode 12 explicitly The queues will use a version greater than 12 now by default. --- eng/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/build.yml b/eng/build.yml index 8f35c9eef8..fb790587d5 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -137,9 +137,6 @@ jobs: sourceFolder: $(Build.ArtifactStagingDirectory)/__download__/Build_$(_BuildConfig)/bin/Linux.$(_BuildArch).$(_BuildConfig) targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/Linux.$(_BuildArch).$(_BuildConfig)' - - ${{ if eq(parameters.osGroup, 'MacOS_cross') }}: - - script: /bin/bash -c "sudo xcode-select -s /Applications/Xcode_12.2.app/Contents/Developer" - - script: $(_dockerEnv) $(_buildScript) -configuration $(_BuildConfig) -architecture $(_BuildArch)