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

Merge in 'release/6.0.1xx' changes

Browse source
This commit is contained in:
dotnet-bot 2022-03-01 01:53:09 +00:00
commit c44b3fb8cb
2 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/SourceBuild/tarball/content/repos/Directory.Build.targets
View file

@ -93,6 +93,8 @@
<!-- Don't warn on warnings that can be generated in source-build <!-- Don't warn on warnings that can be generated in source-build
but not necessarily in repo builds. but not necessarily in repo builds.
NU1603 - See https://github.com/dotnet/source-build/issues/2766.
NU5104 - During preview builds, some packages have pre-release versions. NU5104 - During preview builds, some packages have pre-release versions.
Some repos with stable versions may need to uptake these packages Some repos with stable versions may need to uptake these packages
with pre-release versions because of PVP when building with with pre-release versions because of PVP when building with
@ -101,7 +103,7 @@
<OldText><![CDATA[</Project>]]></OldText> <OldText><![CDATA[</Project>]]></OldText>
<NewText> <NewText>
<![CDATA[ <PropertyGroup> <![CDATA[ <PropertyGroup>
<NoWarn>%24(NoWarn);NU5104</NoWarn> <NoWarn>%24(NoWarn);NU5104;NU1603</NoWarn>
</PropertyGroup> </PropertyGroup>
</Project>]]> </Project>]]>
</NewText> </NewText>

28
src/SourceBuild/tarball/patches/arcade/0001-Resolve-NU1603-issue-w-System.Reflection.Metadata-du.patch
View file

@ -1,28 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Fri, 18 Feb 2022 15:11:39 +0000
Subject: [PATCH] Resolve NU1603 issue w/System.Reflection.Metadata during
bootstrapping
---
.../Microsoft.DotNet.PackageTesting.csproj | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
index 824dc8b..07697f8 100644
--- a/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
+++ b/src/Microsoft.DotNet.PackageTesting/Microsoft.DotNet.PackageTesting.csproj
@@ -8,6 +8,13 @@
<IsPackable>true</IsPackable>
</PropertyGroup>
+ <!-- During bootstrapped source-builds, the following situation can occur:
+ Microsoft.CodeAnalysis.Common z.b.c depends on System.Reflection.Metadata (>= x.y.z) but System.Reflection.Metadata x.y.z was not found.
+ An approximate best match of System.Reflection.Metadata x.y.(z+1) was resolved. -->
+ <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
+ <NoWarn>$(NoWarn);NU1603</NoWarn>
+ </PropertyGroup>
+
<ItemGroup>
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" Publish="false" />
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" Publish="false" />