Some SDK patches to workaround small issues.

Author: crummel

patches/sdk/0021-Disable-check-for-using-both-quiet-and-verbose-that-.patch

@@ -0,0 +1,42 @@
+From 83171b82c8db3adafd862a7ab480f3c148975831 Mon Sep 17 00:00:00 2001
+From: Chris Rummel <[email protected]>
+Date: Sun, 4 Apr 2021 00:08:36 -0500
+Subject: [PATCH 21/21] Disable check for using both quiet and verbose that
+ uses a function we don't have.
+
+---
+ src/BuiltInTools/dotnet-watch/Program.cs | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs
+index 5d0d4c732..2a434243b 100644
+--- a/src/BuiltInTools/dotnet-watch/Program.cs
++++ b/src/BuiltInTools/dotnet-watch/Program.cs
+@@ -110,15 +110,15 @@ internal static RootCommand CreateRootCommand(Func<CommandLineOptions, Task<int>
+                 new[] { "--verbose", "-v" },
+                 "Show verbose output");
+ 
+-            verbose.AddValidator(v =>
+-            {
+-                if (v.FindResultFor(quiet) is not null && v.FindResultFor(verbose) is not null)
+-                {
+-                    return Resources.Error_QuietAndVerboseSpecified;
+-                }
+-
+-                return null;
+-            });
++//            verbose.AddValidator(v =>
++//            {
++//                if (v.FindResultFor(quiet) is not null && v.FindResultFor(verbose) is not null)
++//                {
++//                    return Resources.Error_QuietAndVerboseSpecified;
++//                }
++//
++//                return null;
++//            });
+ 
+             var root = new RootCommand(Description)
+             {
+-- 
+2.18.0
+

patches/sdk/0022-Don-t-think-we-need-this-file.patch

@@ -0,0 +1,25 @@
+From fd2790ad703ab10eb4f82fc8e5d4565b83333753 Mon Sep 17 00:00:00 2001
+From: Chris Rummel <[email protected]>
+Date: Sun, 4 Apr 2021 02:36:35 -0500
+Subject: [PATCH 22/22] Don't think we need this file.
+
+---
+ src/Layout/redist/targets/OverlaySdkOnLKG.targets | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+index ab94ba45b..3dc19ea2c 100644
+--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets
++++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+@@ -14,7 +14,7 @@
+       <OverlaySDK Include="$(_DotNetHiveRoot)/**/*" Exclude="$(_DotNetHiveRoot)sdk/**/*"/>
+       <OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/Microsoft.NETCoreSdk.BundledCliTools.props" />
+       <OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/RuntimeIdentifierGraph.json" />
+-      <OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/NETCoreSdkRuntimeIdentifierChain.txt" />
++      <OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/NETCoreSdkRuntimeIdentifierChain.txt" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+       <!-- Ignore dotnet-watch files from the SDK since we're building a newer version of it in this repo. -->
+       <OverlaySdkFilesFromStage0 Include="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/DotnetTools/**/*" RelativeDestination="DotnetTools"
+         Exclude="$(_DotNetHiveRoot)/sdk/$(Stage0SdkVersion)/DotnetTools/dotnet-watch/**" />
+-- 
+2.18.0
+

patches/sdk/0023-Easy-workaround-for-NuGet-error.patch

@@ -0,0 +1,29 @@
+From bbea3466a1201b31e0712c8fbe25353ec91ad64d Mon Sep 17 00:00:00 2001
+From: Chris Rummel <[email protected]>
+Date: Sun, 4 Apr 2021 09:40:06 -0500
+Subject: [PATCH 23/23] Easy workaround for NuGet error.
+
+---
+ .../OverrideAndCreateBundledNETCoreAppPackageVersion.cs      | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs
+index c3175a3c1..826e4fc36 100644
+--- a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs
++++ b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs
+@@ -118,9 +118,10 @@ void CheckAndReplaceAttribute(XAttribute attribute)
+         /// <returns></returns>
+         private static bool IsSDKServicing(string sdkVersion)
+         {
+-            var parsedSdkVersion = NuGet.Versioning.NuGetVersion.Parse(sdkVersion);
++            // var parsedSdkVersion = NuGet.Versioning.NuGetVersion.Parse(sdkVersion);
+ 
+-            return parsedSdkVersion.Patch % 100 != 0;
++            // return parsedSdkVersion.Patch % 100 != 0;
++            return true;
+         }
+     }
+ }
+-- 
+2.18.0
+