Update llvm project patches
This commit is contained in:
parent
df81445687
commit
9db3c005e2
4 changed files with 0 additions and 48 deletions
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Wed, 10 Aug 2022 13:44:31 -0500
|
||||
Subject: [PATCH] Upgrade to an MS.Build.Traversal version we have a ref
|
||||
package for.
|
||||
|
||||
Backport PR is https://github.com/dotnet/llvm-project/pull/241.
|
||||
|
||||
---
|
||||
global.json | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/global.json b/global.json
|
||||
index df77e9a199d6..19b99be1f71b 100644
|
||||
--- a/global.json
|
||||
+++ b/global.json
|
||||
@@ -5,6 +5,6 @@
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22405.6",
|
||||
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22405.6",
|
||||
- "Microsoft.Build.Traversal": "2.0.2"
|
||||
+ "Microsoft.Build.Traversal": "2.0.34"
|
||||
}
|
||||
}
|
|
@ -1,24 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Rummel <crummel@microsoft.com>
|
||||
Date: Wed, 10 Aug 2022 21:30:49 -0500
|
||||
Subject: [PATCH] Update for new MSBuild warning.
|
||||
|
||||
Backport PR: https://github.com/dotnet/llvm-project/pull/241.
|
||||
|
||||
---
|
||||
nuget/packages.builds | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nuget/packages.builds b/nuget/packages.builds
|
||||
index a4d2bc03d454..85d860081e53 100644
|
||||
--- a/nuget/packages.builds
|
||||
+++ b/nuget/packages.builds
|
||||
@@ -31,7 +31,7 @@
|
||||
<ItemGroup>
|
||||
<!-- Pass the FileVersion calculated by _InitializeAssemblyVersion to referenced projects -->
|
||||
<ProjectReference Update="@(ProjectReference)"
|
||||
- AdditionalProperties="%(AdditionalProperties);FileVersion=$(FileVersion)" />
|
||||
+ AdditionalProperties="%(ProjectReference.AdditionalProperties);FileVersion=$(FileVersion)" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
</Project>
|
Loading…
Add table
Reference in a new issue