From 09683ca2278682dcff45daf3aedc86c3586aa881 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Tue, 26 Oct 2021 06:30:24 -0600
Subject: [PATCH 1/3] Include readme in package

---
 .../Microsoft.VisualStudio.Validation.csproj                  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Microsoft.VisualStudio.Validation/Microsoft.VisualStudio.Validation.csproj b/src/Microsoft.VisualStudio.Validation/Microsoft.VisualStudio.Validation.csproj
index 3b98654d..52edfef8 100644
--- a/src/Microsoft.VisualStudio.Validation/Microsoft.VisualStudio.Validation.csproj
+++ b/src/Microsoft.VisualStudio.Validation/Microsoft.VisualStudio.Validation.csproj
@@ -5,7 +5,11 @@
 
     <Description>Common input validation and state verification utility methods.</Description>
     <PackageTags>InputValidation IntegrityCheck</PackageTags>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
+  <ItemGroup>
+    <None Include="$(RepoRootPath)README.md" Pack="true" PackagePath="" />
+  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Strings.resx">
       <Generator>ResXFileCodeGenerator</Generator>

From 3b2827f0318ab5762738ec0df213bdb0093d2d6c Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Tue, 26 Oct 2021 06:43:09 -0600
Subject: [PATCH 2/3] Update to .NET 6 SDK

This allows the nuget package readme embedding to work.
Also update some other dependencies.
---
 Directory.Build.props | 9 ++++-----
 global.json           | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 163b5ea9..4bfd34ed 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,17 +19,16 @@
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
-    <MicroBuildVersion>2.0.65</MicroBuildVersion>
+    <MicroBuildVersion>2.0.66</MicroBuildVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.240" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="3.11.0" PrivateAssets="all" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.261" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.0.0" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/global.json b/global.json
index 34eb419f..764d8780 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.301",
+    "version": "6.0.100-rc.2.21505.57",
     "rollForward": "patch",
     "allowPrerelease": false
   }

From 67f91702c2699fd4c30dd47878e743488d51f70c Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Tue, 26 Oct 2021 07:31:09 -0600
Subject: [PATCH 3/3] Search for .NET 5+ runtime requirements

---
 tools/Install-DotNetSdk.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/Install-DotNetSdk.ps1 b/tools/Install-DotNetSdk.ps1
index 83ddec87..3c80d5bb 100755
--- a/tools/Install-DotNetSdk.ps1
+++ b/tools/Install-DotNetSdk.ps1
@@ -40,7 +40,7 @@ Get-ChildItem "$PSScriptRoot\..\src\*.*proj","$PSScriptRoot\..\test\*.*proj","$P
             $targetFrameworks = $targetFrameworks -Split ';'
         }
     }
-    $targetFrameworks |? { $_ -match 'netcoreapp(\d+\.\d+)' } |% {
+    $targetFrameworks |? { $_ -match 'net(?:coreapp)?(\d+\.\d+)' } |% {
         $runtimeVersions += $Matches[1]
     }
 }