From 50a33e74cf74c81a0d2ed2a7788c971251f4be43 Mon Sep 17 00:00:00 2001
From: Nathan Mytelka <Forgind@users.noreply.github.com>
Date: Wed, 28 Apr 2021 17:25:39 -0700
Subject: [PATCH] Ignore assembly conflict warnings

---
 Directory.Build.props                     | 5 ++++-
 src/redist/targets/GenerateLayout.targets | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index db48d7f60..35439d3b3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,7 +25,10 @@
     <IsShipping>true</IsShipping>
     <CoreSdkTargetFramework>net6.0</CoreSdkTargetFramework>
 
-    <NoWarn>NU5125;NU5105;NU1701</NoWarn>
+    <!-- MSB3243 and MSB3247 fire when attempting to resolve references to the same assembly from different cultures.
+         This is a prevalent problem in building the precomputed assembly reference cache. Limiting the assemblies resolved
+         to those outside the culture folders would work, but that is a nontrivial problem. -->
+    <NoWarn>NU5125;NU5105;NU1701;MSB3243;MSB3247</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DisableSourceLink)' == 'true'">
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 402ef5b03..f4a272743 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -496,9 +496,6 @@
     <ItemGroup>
       <AssembliesToResolve Include="$(RedistLayoutPath)\**\*.dll" Exclude="$(RedistLayoutPath)\**\native\**\*.dll" />
     </ItemGroup>
-    <PropertyGroup>
-      <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3243;MSB3270;MSB3247</MSBuildWarningsAsMessages>
-    </PropertyGroup>
     <ResolveAssemblyReference AssemblyFiles="@(AssembliesToResolve)" Silent="false" AssemblyInformationCacheOutputPath="$(RedistLayoutPath)sdk\$(Version)\SDKPrecomputedAssemblyReferences.cache" SearchPaths="{RawFileName}" />
   </Target>