mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Ignore assembly conflict warnings

Browse source
This commit is contained in:
Nathan Mytelka 2021-04-28 17:25:39 -07:00
parent c77646dbd5
commit 50a33e74cf
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Directory.Build.props
View file

@ -25,7 +25,10 @@
<IsShipping>true</IsShipping> <IsShipping>true</IsShipping>
<CoreSdkTargetFramework>net6.0</CoreSdkTargetFramework> <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>
<PropertyGroup Condition="'$(DisableSourceLink)' == 'true'"> <PropertyGroup Condition="'$(DisableSourceLink)' == 'true'">

3
src/redist/targets/GenerateLayout.targets
View file

@ -496,9 +496,6 @@
<ItemGroup> <ItemGroup>
<AssembliesToResolve Include="$(RedistLayoutPath)\**\*.dll" Exclude="$(RedistLayoutPath)\**\native\**\*.dll" /> <AssembliesToResolve Include="$(RedistLayoutPath)\**\*.dll" Exclude="$(RedistLayoutPath)\**\native\**\*.dll" />
</ItemGroup> </ItemGroup>
<PropertyGroup>
<MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3243;MSB3270;MSB3247</MSBuildWarningsAsMessages>
</PropertyGroup>
<ResolveAssemblyReference AssemblyFiles="@(AssembliesToResolve)" Silent="false" AssemblyInformationCacheOutputPath="$(RedistLayoutPath)sdk\$(Version)\SDKPrecomputedAssemblyReferences.cache" SearchPaths="{RawFileName}" /> <ResolveAssemblyReference AssemblyFiles="@(AssembliesToResolve)" Silent="false" AssemblyInformationCacheOutputPath="$(RedistLayoutPath)sdk\$(Version)\SDKPrecomputedAssemblyReferences.cache" SearchPaths="{RawFileName}" />
</Target> </Target>