From 6e49a17a7baa0c12e5129a8d13070f1167ea4c0e Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Thu, 25 Aug 2022 17:31:23 +0000 Subject: [PATCH] Resolve llvm source-build patch conflict --- ...Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch index 57846fba6..098694eff 100644 --- a/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch +++ b/src/SourceBuild/tarball/patches/llvm-project/0001-Upgrade-to-an-MS.Build.Traversal-version-we-have-a-r.patch @@ -16,8 +16,8 @@ index df77e9a199d6..19b99be1f71b 100644 +++ b/global.json @@ -5,6 +5,6 @@ "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22367.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22367.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22358.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22358.3", - "Microsoft.Build.Traversal": "2.0.2" + "Microsoft.Build.Traversal": "2.0.34" }