From 3aaa428fbd97632f6dfce4c729c3a10b155f3150 Mon Sep 17 00:00:00 2001
From: Layomi Akinrinade <layomia@gmail.com>
Date: Mon, 9 Aug 2021 13:02:00 -0700
Subject: [PATCH 1/2] Re-add S.T.J.SourceGeneration.UnitTests to STJ sln

---
 src/libraries/System.Text.Json/System.Text.Json.sln | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln
index 4b861f7d7c3891..b8309363a7b30a 100644
--- a/src/libraries/System.Text.Json/System.Text.Json.sln
+++ b/src/libraries/System.Text.Json/System.Text.Json.sln
@@ -43,6 +43,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{BE27618A-2916-4269-9AD5-6BC5EDC32B30}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Text.Json.SourceGeneration.UnitTests", "tests\System.Text.Json.SourceGeneration.UnitTests\System.Text.Json.SourceGeneration.UnitTests.csproj", "{F6A18EB5-A8CC-4A39-9E85-5FA226019C3D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -117,6 +119,10 @@ Global
 		{BE27618A-2916-4269-9AD5-6BC5EDC32B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BE27618A-2916-4269-9AD5-6BC5EDC32B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BE27618A-2916-4269-9AD5-6BC5EDC32B30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6A18EB5-A8CC-4A39-9E85-5FA226019C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6A18EB5-A8CC-4A39-9E85-5FA226019C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6A18EB5-A8CC-4A39-9E85-5FA226019C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6A18EB5-A8CC-4A39-9E85-5FA226019C3D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -139,6 +145,7 @@ Global
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1}
 		{C56337BB-8CBC-4EE5-AB4D-8BB0A922813E} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4}
 		{BE27618A-2916-4269-9AD5-6BC5EDC32B30} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4}
+		{F6A18EB5-A8CC-4A39-9E85-5FA226019C3D} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5868B757-D821-41FC-952E-2113A0519506}

From a1ec4f3ac94631949be9a8ca245d1395a7b1789f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Aug 2021 10:03:06 +0200
Subject: [PATCH 2/2] Update slngen.template.proj

---
 eng/slngen.template.proj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/slngen.template.proj b/eng/slngen.template.proj
index 0ed6e0651dbb9c..466fc9aeb58549 100644
--- a/eng/slngen.template.proj
+++ b/eng/slngen.template.proj
@@ -6,6 +6,8 @@
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)ref\*.*proj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)src\*.*proj" />
+    <!-- Keep in sync with https://github.com/dotnet/runtime/blob/4d82932722b56924598708f991961a75e5a90b36/src/libraries/Directory.Build.props#L31. -->
     <ProjectReference Include="$(MSBuildThisFileDirectory)tests\**\*.Tests.*proj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)tests\**\*.UnitTests.*proj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>