Merge pull request #12287 from MichaelSimons/patch-cleanup

Remove source-build obsolete bootstrapping patches
This commit is contained in:
Michael Simons 2021-10-11 15:01:45 -05:00 committed by GitHub
commit b65fee00a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 61 deletions

View file

@ -1,34 +0,0 @@
From 6fce3b3afda68cd041cb3b38c8c21fa0513ab5e3 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 2 Aug 2021 19:56:17 +0000
Subject: [PATCH] Exclude warnings as errors from source build
NU1604: These hopefully go away once runtime-portable is added to the tarball.
Microsoft.AspNetCore.App.Runtime.csproj : error NU1604: Project dependency Microsoft.NETCore.App.Crossgen2.linux-x64 does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results.
Microsoft.AspNetCore.App.Runtime.csproj : error NU1604: Project dependency Microsoft.NETCore.App.Runtime.linux-x64 does not contain an inclusive lower bound. Include a lower bound in the dependency version to ensure consistent restore results.
CS8601:
CascadingAuthenticationState.razor(4,108): error CS8601: Possible null reference assignment.
---
Directory.Build.props | 4 ++++++++++++++
1 file changed, 4 insertions(+)
diff --git a/Directory.Build.props b/Directory.Build.props
index ba1c1675a0..ce6bc50c66 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -225,6 +225,10 @@
<ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
</PropertyGroup>
+ <PropertyGroup>
+ <NoWarn>$(NoWarn);NU1604;CS8601</NoWarn>
+ </PropertyGroup>
+
<Import Project="eng\Workarounds.props" />
<Import Project="artifacts\bin\GenerateFiles\Directory.Build.props" Condition=" '$(MSBuildProjectName)' != 'GenerateFiles' " />
<Import Project="eng\Dependencies.props" />
--
2.29.2

View file

@ -1,27 +0,0 @@
From 4d2c2370dc85e658508fd0943e47b0d6559f42d5 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 9 Aug 2021 14:03:33 +0000
Subject: [PATCH] NoWarn NU1605 until DeploymentTools is in SourceBuild
src/Cli/dotnet/dotnet.csproj : error NU1605: Detected package downgrade: Newtonsoft.Json from 12.0.3 to 12.0.2. Reference the package directly from the project to select a different version.
Error stems from Microsoft.Deployment.DotNet.Releases not being source built and referencing a newer version. Temporary fix until the DeploymentTools repo is added to source-build (https://github.com/dotnet/source-build/issues/2365).
---
src/Cli/dotnet/dotnet.csproj | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
index 4ff965a4d..f9609824b 100644
--- a/src/Cli/dotnet/dotnet.csproj
+++ b/src/Cli/dotnet/dotnet.csproj
@@ -12,6 +12,7 @@
<PackageId>Microsoft.DotNet.Cli</PackageId>
<UseAppHost>false</UseAppHost>
<IsPackable>true</IsPackable>
+ <NoWarn>$(NoWarn);NU1605</NoWarn>
</PropertyGroup>
<ItemGroup>
<Compile Remove="commands\dotnet-new\**" />
--
2.29.2