From 253e62c08488d57a5b740fb68475501353713cdd Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Fri, 4 Nov 2022 12:02:25 -0600
Subject: [PATCH 1/4] Simplify parent import pattern

---
 src/Directory.Build.props    | 2 +-
 src/Directory.Build.targets  | 2 +-
 test/Directory.Build.props   | 2 +-
 test/Directory.Build.targets | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 77d94765..052fe3ef 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 566ab4fc..c1d929a5 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -3,5 +3,5 @@
     <Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
   </ItemGroup>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))\Directory.Build.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))' != '' " />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 449a06e4..ad4a4b6c 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))\Directory.Build.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.props))' != '' " />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index e7edee55..052fe3ef 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -1,3 +1,3 @@
 <Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))\Directory.Build.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, Directory.Build.targets))' != '' " />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
 </Project>

From 610968dc21b84a116d0bd1c7a0ff00441308f536 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Fri, 4 Nov 2022 12:27:24 -0600
Subject: [PATCH 2/4] Remove redundant attribute

---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 14fd9704..75b67153 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -18,7 +18,7 @@
     <GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" />
   </ItemGroup>
   <ItemGroup>
-    <!-- <GlobalPackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" /> -->
+    <!-- <GlobalPackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" /> -->
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" />
   </ItemGroup>

From f91a0e871d9f794cc36020341f358718d6b07f83 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Fri, 4 Nov 2022 14:19:46 -0600
Subject: [PATCH 3/4] Avoid .NET 7 SDK till it's stable

Otherwise, msbuild.exe fails on VS 17.3, which is the latest stable release. We need to wait till folks can use VS 17.4 to use the .NET 7 SDK.
---
 Directory.Packages.props | 24 ++++++++++++++++++------
 global.json              |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index c33a3beb..8c1e8f80 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -8,14 +8,26 @@
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="xunit" Version="2.4.2" />
   </ItemGroup>
+  <!-- The following PackageVersion and PackageReference items should be consolidated to GlobalPackageReference items
+       once we can target the stable .NET 7 SDK and Visual Studio 2022 Update 4 is generally available in cloud build agents.-->
   <ItemGroup>
-    <GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.329" />
-    <GlobalPackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
-    <GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" />
-    <GlobalPackageReference Include="Nullable" Version="1.3.1" />
-    <GlobalPackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" />
+    <PackageVersion Include="CSharpIsNullAnalyzer" Version="0.1.329" />
+    <PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
+    <PackageVersion Include="Nullable" Version="1.3.1" />
+    <PackageVersion Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" />
   </ItemGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CSharpIsNullAnalyzer" PrivateAssets="all" />
+    <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" PrivateAssets="all" />
+    <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
+    <PackageReference Include="Nullable" PrivateAssets="all" />
+    <PackageReference Include="StyleCop.Analyzers.Unstable" PrivateAssets="all" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
index 01e689ed..3ce46e09 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100-rc.2.22477.23",
+    "version": "6.0.402",
     "rollForward": "patch",
     "allowPrerelease": false
   }

From 956093988fd134e694a50850e9488953ba4aaed2 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrew.arnott@microsoft.com>
Date: Fri, 4 Nov 2022 14:22:24 -0600
Subject: [PATCH 4/4] Avoid spreading package version information into test
 directory

---
 Directory.Packages.props      | 1 +
 test/Directory.Build.props    | 4 ++++
 test/Directory.Packages.props | 7 -------
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 test/Directory.Packages.props

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 75b67153..a2770162 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -7,6 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
     <PackageVersion Include="xunit" Version="2.4.2" />
   </ItemGroup>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index f3d4b88b..1ca1ec44 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -5,4 +5,8 @@
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" PrivateAssets="all" />
+  </ItemGroup>
 </Project>
diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props
deleted file mode 100644
index 14735472..00000000
--- a/test/Directory.Packages.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove($(MSBuildThisFile), $(MSBuildThisFileDirectory)..))" />
-
-  <ItemGroup>
-    <GlobalPackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
-  </ItemGroup>
-</Project>