diff --git a/eng/slngen.targets b/eng/slngen.targets
index f8066c75c736df..7486839ebd179f 100644
--- a/eng/slngen.targets
+++ b/eng/slngen.targets
@@ -4,11 +4,8 @@
     <SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true'">tests</SlnGenSolutionFolder>
     <SlnGenSolutionFolder Condition="'$(SlnGenSolutionFolder)' == ''">src</SlnGenSolutionFolder>
 
-    <!-- Don't include shared framework projects referenced via a named reference except the leaf's project. -->
-    <IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)'">false</IncludeInSolutionFile>
-
-    <!-- Include CompilerServices.Unsafe as it's a transitive test dependency. -->
-    <IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' == 'System.Runtime.CompilerServices.Unsafe'">true</IncludeInSolutionFile>
+    <!-- Don't include shared framework projects except the leaf's project and OOBs. -->
+    <IncludeInSolutionFile Condition="'$(IsNETCoreAppRef)' == 'true' and '$(MSBuildProjectName)' != '$(SlnGenMainProject)' and '$(IsNETCoreAppPackage)' != 'true'">false</IncludeInSolutionFile>
   </PropertyGroup>
   <ItemGroup>
     <SlnGenCustomProjectTypeGuid Include=".ilproj" ProjectTypeGuid="{9A19103F-16F7-4668-BE54-9A1E7A4F7556}" />
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 5e28db1deeb28d..054dd164c2f960 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -49,6 +49,7 @@
     <IsNETCoreAppRef Condition="'$(IsNETCoreAppRef)' == '' and
                                 '$(IsReferenceAssembly)' == 'true' and
                                 $(NetCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsNETCoreAppRef>
+    <IsNETCoreAppPackage Condition="$(NetCoreAppLibraryPackage.Contains('$(AssemblyName);'))">true</IsNETCoreAppPackage>
 
     <!-- By default, disable implicit framework references for NetCoreAppCurrent libraries. -->
     <DisableImplicitFrameworkReferences Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
@@ -339,5 +340,13 @@
            Text="Analyzers must only target netstandard2.0 since they run in the compiler which targets netstandard2.0. The following files were found to target '%(_AnalyzerPackFile.TargetFramework)': @(_AnalyzerPackFile)" />
   </Target>
 
+  <Target Name="EnsureNetCoreAppLibraryPackage" BeforeTargets="Pack">
+    <Error Condition="'$(IsNETCoreAppPackage)' != 'true' and '$(IsNETCoreAppSrc)' == 'true' and '$(IsPackable)' == 'true'"
+           Text="Please add $(AssemblyName) to the NetCoreAppLibraryPackage property." />
+           
+    <Error Condition="'$(IsNETCoreAppPackage)' == 'true' and '$(IsSourceProject)' == 'true' and ('$(IsNETCoreAppSrc)' != 'true' or '$(IsPackable)' != 'true')"
+           Text="Please remove $(AssemblyName) from the NetCoreAppLibraryPackage property." />
+  </Target>
+
   <Import Project="$(MSBuildThisFileDirectory)workloads-testing.targets" />
 </Project>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
index 648fd67ef942e7..72c897af15bc7f 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.sln
@@ -47,17 +47,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7517D0A0-5596-48B7-96EF-CB24DAD72675}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{DE948797-2FDC-411C-841E-5A895F58DE01}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{BD19B1E7-CAFF-4009-874A-760D5A466E28}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{160C3D6B-D90A-40B1-A695-81DB79EB24C4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{ABD24BF4-0C51-4DC5-9B59-4B408B63DC9E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{A49023C8-173A-4B8F-84B3-2FF37FE8344A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F57E720-CBFF-4648-A507-EFCBCECB5FD3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B360B5E7-3F3F-4393-9926-C3786F0FEAEE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9C37B729-046B-4419-ADAD-18081467884C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EB30DD9D-AA0D-4DCC-AA8D-3E347A6E0DC1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1789A282-9C08-40AB-9FD0-0FB1FAB99621}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E6D45622-5CF1-4D69-90F1-76D2AEAEF696}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -77,66 +81,86 @@ Global
 		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5374E4B3-FFA0-47E3-9400-C086E6C236CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5374E4B3-FFA0-47E3-9400-C086E6C236CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5374E4B3-FFA0-47E3-9400-C086E6C236CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5374E4B3-FFA0-47E3-9400-C086E6C236CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5018015-F6E7-404B-99C5-980FF8298832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5018015-F6E7-404B-99C5-980FF8298832}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5018015-F6E7-404B-99C5-980FF8298832}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5018015-F6E7-404B-99C5-980FF8298832}.Release|Any CPU.Build.0 = Release|Any CPU
-		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9355C322-9769-418B-9B00-09EF8E96D263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9355C322-9769-418B-9B00-09EF8E96D263}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9355C322-9769-418B-9B00-09EF8E96D263}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9355C322-9769-418B-9B00-09EF8E96D263}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABD24BF4-0C51-4DC5-9B59-4B408B63DC9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABD24BF4-0C51-4DC5-9B59-4B408B63DC9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABD24BF4-0C51-4DC5-9B59-4B408B63DC9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABD24BF4-0C51-4DC5-9B59-4B408B63DC9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D798B08-E806-4D50-A103-4F8F0F78770D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{263497F5-8AAC-4E15-97EC-4871E1E9606F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{263497F5-8AAC-4E15-97EC-4871E1E9606F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{263497F5-8AAC-4E15-97EC-4871E1E9606F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{263497F5-8AAC-4E15-97EC-4871E1E9606F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5018015-F6E7-404B-99C5-980FF8298832}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5018015-F6E7-404B-99C5-980FF8298832}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5018015-F6E7-404B-99C5-980FF8298832}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5018015-F6E7-404B-99C5-980FF8298832}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B059E91C-DA44-46BB-BD06-D208258ED8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B059E91C-DA44-46BB-BD06-D208258ED8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B059E91C-DA44-46BB-BD06-D208258ED8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B059E91C-DA44-46BB-BD06-D208258ED8E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A49023C8-173A-4B8F-84B3-2FF37FE8344A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A49023C8-173A-4B8F-84B3-2FF37FE8344A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A49023C8-173A-4B8F-84B3-2FF37FE8344A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A49023C8-173A-4B8F-84B3-2FF37FE8344A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9355C322-9769-418B-9B00-09EF8E96D263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9355C322-9769-418B-9B00-09EF8E96D263}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9355C322-9769-418B-9B00-09EF8E96D263}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9355C322-9769-418B-9B00-09EF8E96D263}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01CEF916-5FF9-4566-A507-08FD019E04F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE948797-2FDC-411C-841E-5A895F58DE01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE948797-2FDC-411C-841E-5A895F58DE01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE948797-2FDC-411C-841E-5A895F58DE01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE948797-2FDC-411C-841E-5A895F58DE01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1723D4C-15E3-4A39-8976-C3E1740E5F00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A80D098-69EC-45FE-A064-4CBDFA44BA43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B6760CA-AC54-4549-9EA1-823BDF841BCA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD19B1E7-CAFF-4009-874A-760D5A466E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -145,22 +169,14 @@ Global
 		{160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{160C3D6B-D90A-40B1-A695-81DB79EB24C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7517D0A0-5596-48B7-96EF-CB24DAD72675}.Release|Any CPU.Build.0 = Release|Any CPU
 		{68210977-E10C-4BC3-B235-31B6E2AF9830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{68210977-E10C-4BC3-B235-31B6E2AF9830}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68210977-E10C-4BC3-B235-31B6E2AF9830}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68210977-E10C-4BC3-B235-31B6E2AF9830}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78219FF4-C28B-4EA4-B0F9-B5467296A267}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D650281-5B86-4A2C-9D09-41BD3846B072}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C29E3A6-45F5-4747-B471-A48EFDF88247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C29E3A6-45F5-4747-B471-A48EFDF88247}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C29E3A6-45F5-4747-B471-A48EFDF88247}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -169,42 +185,40 @@ Global
 		{FE50757B-7862-49D2-812E-1646F6FE0070}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE50757B-7862-49D2-812E-1646F6FE0070}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE50757B-7862-49D2-812E-1646F6FE0070}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{7D798B08-E806-4D50-A103-4F8F0F78770D} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{5374E4B3-FFA0-47E3-9400-C086E6C236CD} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{9355C322-9769-418B-9B00-09EF8E96D263} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{9B6760CA-AC54-4549-9EA1-823BDF841BCA} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{78219FF4-C28B-4EA4-B0F9-B5467296A267} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{0D650281-5B86-4A2C-9D09-41BD3846B072} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{4C29E3A6-45F5-4747-B471-A48EFDF88247} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699} = {1F57E720-CBFF-4648-A507-EFCBCECB5FD3}
-		{9F495CC2-5325-4F18-831C-8DEFB2F89206} = {9C37B729-046B-4419-ADAD-18081467884C}
-		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38} = {9C37B729-046B-4419-ADAD-18081467884C}
-		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{B5018015-F6E7-404B-99C5-980FF8298832} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{263497F5-8AAC-4E15-97EC-4871E1E9606F} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{B059E91C-DA44-46BB-BD06-D208258ED8E7} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{01CEF916-5FF9-4566-A507-08FD019E04F9} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{160C3D6B-D90A-40B1-A695-81DB79EB24C4} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{68210977-E10C-4BC3-B235-31B6E2AF9830} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
-		{FE50757B-7862-49D2-812E-1646F6FE0070} = {1789A282-9C08-40AB-9FD0-0FB1FAB99621}
+		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{5374E4B3-FFA0-47E3-9400-C086E6C236CD} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{9355C322-9769-418B-9B00-09EF8E96D263} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{ABD24BF4-0C51-4DC5-9B59-4B408B63DC9E} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{7D798B08-E806-4D50-A103-4F8F0F78770D} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{DE948797-2FDC-411C-841E-5A895F58DE01} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{78219FF4-C28B-4EA4-B0F9-B5467296A267} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{0D650281-5B86-4A2C-9D09-41BD3846B072} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{9B6760CA-AC54-4549-9EA1-823BDF841BCA} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{4C29E3A6-45F5-4747-B471-A48EFDF88247} = {B360B5E7-3F3F-4393-9926-C3786F0FEAEE}
+		{9F495CC2-5325-4F18-831C-8DEFB2F89206} = {EB30DD9D-AA0D-4DCC-AA8D-3E347A6E0DC1}
+		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38} = {EB30DD9D-AA0D-4DCC-AA8D-3E347A6E0DC1}
+		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{01CEF916-5FF9-4566-A507-08FD019E04F9} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{263497F5-8AAC-4E15-97EC-4871E1E9606F} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{B5018015-F6E7-404B-99C5-980FF8298832} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{B059E91C-DA44-46BB-BD06-D208258ED8E7} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{160C3D6B-D90A-40B1-A695-81DB79EB24C4} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{68210977-E10C-4BC3-B235-31B6E2AF9830} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
+		{FE50757B-7862-49D2-812E-1646F6FE0070} = {E6D45622-5CF1-4D69-90F1-76D2AEAEF696}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2D9A0B20-A56C-4FBA-805A-DAAA97615597}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
index e13f9f1bb81357..8099bea409f275 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.sln
@@ -47,17 +47,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{A4E6312C-CAC4-4E30-BA6F-2A1B80F4DDFD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{1555B38A-E9CB-4734-AAB1-59CFB833A06D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{50A62B50-3EB0-4F27-99ED-629E9090F477}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2434A707-1012-4104-81A0-1A1B25D9FEEA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A1629770-925E-448B-8EA6-E143A3226E97}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9271105D-1A42-4874-BE96-1F1E6A95FD40}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -77,46 +81,38 @@ Global
 		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{925D218A-9DE4-4237-814B-BE68CC0D35E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{925D218A-9DE4-4237-814B-BE68CC0D35E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{925D218A-9DE4-4237-814B-BE68CC0D35E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{925D218A-9DE4-4237-814B-BE68CC0D35E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52E22D6B-87AB-4499-AE22-C834925456E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52E22D6B-87AB-4499-AE22-C834925456E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52E22D6B-87AB-4499-AE22-C834925456E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52E22D6B-87AB-4499-AE22-C834925456E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7A05EA4C-E84C-4498-AEF3-964DB25A8348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7A05EA4C-E84C-4498-AEF3-964DB25A8348}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7A05EA4C-E84C-4498-AEF3-964DB25A8348}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7A05EA4C-E84C-4498-AEF3-964DB25A8348}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB0A5C33-5CDF-441D-8166-459437381CDD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E83BD1A-DB95-4DC8-82C0-D380761B4285}.Release|Any CPU.Build.0 = Release|Any CPU
 		{254B732C-0743-4493-80A2-BD92745A7C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{254B732C-0743-4493-80A2-BD92745A7C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{254B732C-0743-4493-80A2-BD92745A7C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{254B732C-0743-4493-80A2-BD92745A7C0C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA38DF6E-D08D-4404-AE10-026C0856834C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA38DF6E-D08D-4404-AE10-026C0856834C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA38DF6E-D08D-4404-AE10-026C0856834C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -125,22 +121,34 @@ Global
 		{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5120F23-273D-4B52-A599-BBED17A48A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5120F23-273D-4B52-A599-BBED17A48A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5120F23-273D-4B52-A599-BBED17A48A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5120F23-273D-4B52-A599-BBED17A48A08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{26891E23-5E9D-4A36-996B-B41FEA3C0162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26891E23-5E9D-4A36-996B-B41FEA3C0162}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26891E23-5E9D-4A36-996B-B41FEA3C0162}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{26891E23-5E9D-4A36-996B-B41FEA3C0162}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50A62B50-3EB0-4F27-99ED-629E9090F477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50A62B50-3EB0-4F27-99ED-629E9090F477}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50A62B50-3EB0-4F27-99ED-629E9090F477}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50A62B50-3EB0-4F27-99ED-629E9090F477}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5120F23-273D-4B52-A599-BBED17A48A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5120F23-273D-4B52-A599-BBED17A48A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5120F23-273D-4B52-A599-BBED17A48A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5120F23-273D-4B52-A599-BBED17A48A08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFB63B04-4583-45CD-BA20-C7FC005AE81A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -149,62 +157,68 @@ Global
 		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4E6312C-CAC4-4E30-BA6F-2A1B80F4DDFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4E6312C-CAC4-4E30-BA6F-2A1B80F4DDFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4E6312C-CAC4-4E30-BA6F-2A1B80F4DDFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4E6312C-CAC4-4E30-BA6F-2A1B80F4DDFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA96A79C-A11A-46ED-8123-BF0EE908EA40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA96A79C-A11A-46ED-8123-BF0EE908EA40}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA96A79C-A11A-46ED-8123-BF0EE908EA40}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA96A79C-A11A-46ED-8123-BF0EE908EA40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1555B38A-E9CB-4734-AAB1-59CFB833A06D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{54B89407-FCD9-4B1A-8F83-04585D437443}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{54B89407-FCD9-4B1A-8F83-04585D437443}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54B89407-FCD9-4B1A-8F83-04585D437443}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54B89407-FCD9-4B1A-8F83-04585D437443}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96003091-9E9D-42D5-85A6-C2DFBD9DD847}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B1445194-8B98-467C-BC04-979E7D1B5942} = {2434A707-1012-4104-81A0-1A1B25D9FEEA}
-		{0E83BD1A-DB95-4DC8-82C0-D380761B4285} = {2434A707-1012-4104-81A0-1A1B25D9FEEA}
-		{E43F6FC6-A51D-473C-A942-7636CE5794DB} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{925D218A-9DE4-4237-814B-BE68CC0D35E9} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{254B732C-0743-4493-80A2-BD92745A7C0C} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{EA38DF6E-D08D-4404-AE10-026C0856834C} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{F5120F23-273D-4B52-A599-BBED17A48A08} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{EA96A79C-A11A-46ED-8123-BF0EE908EA40} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{96003091-9E9D-42D5-85A6-C2DFBD9DD847} = {9A8D52D9-CDB4-4F59-8014-94BF08B4FAB3}
-		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{52E22D6B-87AB-4499-AE22-C834925456E9} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{CB0A5C33-5CDF-441D-8166-459437381CDD} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{7A05EA4C-E84C-4498-AEF3-964DB25A8348} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{AFB63B04-4583-45CD-BA20-C7FC005AE81A} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{26891E23-5E9D-4A36-996B-B41FEA3C0162} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
-		{54B89407-FCD9-4B1A-8F83-04585D437443} = {B5EF5DDD-EB92-414C-B9D2-826BA6CECCBF}
+		{B1445194-8B98-467C-BC04-979E7D1B5942} = {A1629770-925E-448B-8EA6-E143A3226E97}
+		{0E83BD1A-DB95-4DC8-82C0-D380761B4285} = {A1629770-925E-448B-8EA6-E143A3226E97}
+		{E43F6FC6-A51D-473C-A942-7636CE5794DB} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{925D218A-9DE4-4237-814B-BE68CC0D35E9} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{254B732C-0743-4493-80A2-BD92745A7C0C} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{EA38DF6E-D08D-4404-AE10-026C0856834C} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{50A62B50-3EB0-4F27-99ED-629E9090F477} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{F5120F23-273D-4B52-A599-BBED17A48A08} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{A4E6312C-CAC4-4E30-BA6F-2A1B80F4DDFD} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{EA96A79C-A11A-46ED-8123-BF0EE908EA40} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{96003091-9E9D-42D5-85A6-C2DFBD9DD847} = {BEA00A4D-9FB2-4C64-9153-6C2F5865E6F1}
+		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{52E22D6B-87AB-4499-AE22-C834925456E9} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{7A05EA4C-E84C-4498-AEF3-964DB25A8348} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{CB0A5C33-5CDF-441D-8166-459437381CDD} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{26891E23-5E9D-4A36-996B-B41FEA3C0162} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{AFB63B04-4583-45CD-BA20-C7FC005AE81A} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{30EBBE93-80FC-442D-ADC6-D0BB0A8CFA76} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
+		{54B89407-FCD9-4B1A-8F83-04585D437443} = {9271105D-1A42-4874-BE96-1F1E6A95FD40}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E7F79175-49DD-42AD-833B-AE64950FE3D2}
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
index 4c9af48921eafd..ba479cfc323d22 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.sln
@@ -47,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{83270DD0-3E9F-460B-8EAA-4F33A6EB9025}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{8D549462-8BF9-4079-A331-387F1FDB8A07}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}"
@@ -71,11 +73,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{C77305BE-823E-487F-825E-9C26E0674CC6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB0BAC3A-1FE6-4649-83DF-DC165669C74F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC596411-85F4-49FD-8A23-BE2983825CF1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B190887E-C6D6-4534-A740-02C266DAD316}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D94A88BA-8E38-469B-AE38-A7967469D7AB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -95,66 +97,70 @@ Global
 		{5CB1D123-853E-4FE7-9484-AAAD7330897C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5CB1D123-853E-4FE7-9484-AAAD7330897C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CB1D123-853E-4FE7-9484-AAAD7330897C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21E44CA2-5355-4092-9EF7-A94520EBDD40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21E44CA2-5355-4092-9EF7-A94520EBDD40}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21E44CA2-5355-4092-9EF7-A94520EBDD40}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21E44CA2-5355-4092-9EF7-A94520EBDD40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EFC0C2A3-1F51-4299-BE43-78284F6AC670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFC0C2A3-1F51-4299-BE43-78284F6AC670}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFC0C2A3-1F51-4299-BE43-78284F6AC670}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFC0C2A3-1F51-4299-BE43-78284F6AC670}.Release|Any CPU.Build.0 = Release|Any CPU
-		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8CBDDA63-8388-42AF-934E-7C60832A9B1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8CBDDA63-8388-42AF-934E-7C60832A9B1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8CBDDA63-8388-42AF-934E-7C60832A9B1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8CBDDA63-8388-42AF-934E-7C60832A9B1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA8D3F2F-410D-4E32-B104-12929767D1A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1E05D83-5479-43B7-B25C-D8243FE6B89F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4039B868-612D-420F-BC25-481660475CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4039B868-612D-420F-BC25-481660475CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4039B868-612D-420F-BC25-481660475CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4039B868-612D-420F-BC25-481660475CA8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B866430-6F0B-49F1-8294-7B07F766797A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B866430-6F0B-49F1-8294-7B07F766797A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B866430-6F0B-49F1-8294-7B07F766797A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B866430-6F0B-49F1-8294-7B07F766797A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26C61EB7-2798-4314-B750-8CD2837D4216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26C61EB7-2798-4314-B750-8CD2837D4216}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26C61EB7-2798-4314-B750-8CD2837D4216}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26C61EB7-2798-4314-B750-8CD2837D4216}.Release|Any CPU.Build.0 = Release|Any CPU
 		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26C61EB7-2798-4314-B750-8CD2837D4216}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26C61EB7-2798-4314-B750-8CD2837D4216}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26C61EB7-2798-4314-B750-8CD2837D4216}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26C61EB7-2798-4314-B750-8CD2837D4216}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B866430-6F0B-49F1-8294-7B07F766797A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B866430-6F0B-49F1-8294-7B07F766797A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B866430-6F0B-49F1-8294-7B07F766797A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B866430-6F0B-49F1-8294-7B07F766797A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{03A8EBF2-F912-480F-99E1-34A9A33DD525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{03A8EBF2-F912-480F-99E1-34A9A33DD525}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{03A8EBF2-F912-480F-99E1-34A9A33DD525}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -163,54 +169,54 @@ Global
 		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A00E22C3-A552-4F4C-AF2C-813B96A54582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A00E22C3-A552-4F4C-AF2C-813B96A54582}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A00E22C3-A552-4F4C-AF2C-813B96A54582}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A00E22C3-A552-4F4C-AF2C-813B96A54582}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6824AD93-4154-4710-A018-81DA1FA98C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6824AD93-4154-4710-A018-81DA1FA98C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6824AD93-4154-4710-A018-81DA1FA98C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6824AD93-4154-4710-A018-81DA1FA98C40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B25AD126-F78D-45CC-AD06-6F1E03D570DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{981358A2-F5ED-45CE-B037-446BB0F4E859}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{981358A2-F5ED-45CE-B037-446BB0F4E859}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{981358A2-F5ED-45CE-B037-446BB0F4E859}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{981358A2-F5ED-45CE-B037-446BB0F4E859}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C77305BE-823E-487F-825E-9C26E0674CC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C77305BE-823E-487F-825E-9C26E0674CC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C77305BE-823E-487F-825E-9C26E0674CC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C77305BE-823E-487F-825E-9C26E0674CC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6824AD93-4154-4710-A018-81DA1FA98C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6824AD93-4154-4710-A018-81DA1FA98C40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6824AD93-4154-4710-A018-81DA1FA98C40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6824AD93-4154-4710-A018-81DA1FA98C40}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84E43ED2-A2ED-49F9-B592-92270F0F2EC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{91F63A74-902E-44DF-8A78-FD74D030E619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91F63A74-902E-44DF-8A78-FD74D030E619}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91F63A74-902E-44DF-8A78-FD74D030E619}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91F63A74-902E-44DF-8A78-FD74D030E619}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1B505DC-F049-4082-8A24-0CB08B99ACAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C77305BE-823E-487F-825E-9C26E0674CC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C77305BE-823E-487F-825E-9C26E0674CC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C77305BE-823E-487F-825E-9C26E0674CC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C77305BE-823E-487F-825E-9C26E0674CC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D549462-8BF9-4079-A331-387F1FDB8A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D549462-8BF9-4079-A331-387F1FDB8A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D549462-8BF9-4079-A331-387F1FDB8A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D549462-8BF9-4079-A331-387F1FDB8A07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{83270DD0-3E9F-460B-8EAA-4F33A6EB9025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{83270DD0-3E9F-460B-8EAA-4F33A6EB9025}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{83270DD0-3E9F-460B-8EAA-4F33A6EB9025}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -232,42 +238,43 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{A9B02E45-3372-48F4-8761-46F916400B6E} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{CA8D3F2F-410D-4E32-B104-12929767D1A8} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{B1E05D83-5479-43B7-B25C-D8243FE6B89F} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{4039B868-612D-420F-BC25-481660475CA8} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{981358A2-F5ED-45CE-B037-446BB0F4E859} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{91F63A74-902E-44DF-8A78-FD74D030E619} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{1AE88632-F602-4B2F-A269-A7631A361FA7} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{7A133F28-55F2-4143-8529-6DC7E994D852} = {AB0BAC3A-1FE6-4649-83DF-DC165669C74F}
-		{B05F7183-70C1-4C10-9FFE-66301E0B076B} = {AC596411-85F4-49FD-8A23-BE2983825CF1}
-		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4} = {AC596411-85F4-49FD-8A23-BE2983825CF1}
-		{5CB1D123-853E-4FE7-9484-AAAD7330897C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{21E44CA2-5355-4092-9EF7-A94520EBDD40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{EFC0C2A3-1F51-4299-BE43-78284F6AC670} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{8CBDDA63-8388-42AF-934E-7C60832A9B1C} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{5B866430-6F0B-49F1-8294-7B07F766797A} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{26C61EB7-2798-4314-B750-8CD2837D4216} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{03A8EBF2-F912-480F-99E1-34A9A33DD525} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{B25AD126-F78D-45CC-AD06-6F1E03D570DA} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{A00E22C3-A552-4F4C-AF2C-813B96A54582} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{6824AD93-4154-4710-A018-81DA1FA98C40} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{C77305BE-823E-487F-825E-9C26E0674CC6} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{84E43ED2-A2ED-49F9-B592-92270F0F2EC3} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{B1B505DC-F049-4082-8A24-0CB08B99ACAC} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{83270DD0-3E9F-460B-8EAA-4F33A6EB9025} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
-		{2CD88C05-D0CB-49FE-B1D8-341BFDAE4BEF} = {373E0EA7-D9A1-4D7A-A300-9B2583AA09FD}
+		{A9B02E45-3372-48F4-8761-46F916400B6E} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{CA8D3F2F-410D-4E32-B104-12929767D1A8} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{B1E05D83-5479-43B7-B25C-D8243FE6B89F} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{4039B868-612D-420F-BC25-481660475CA8} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{981358A2-F5ED-45CE-B037-446BB0F4E859} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{91F63A74-902E-44DF-8A78-FD74D030E619} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{8D549462-8BF9-4079-A331-387F1FDB8A07} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{1AE88632-F602-4B2F-A269-A7631A361FA7} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{7A133F28-55F2-4143-8529-6DC7E994D852} = {DB81BCDF-417D-43D1-87D2-3E6E3471CCE3}
+		{B05F7183-70C1-4C10-9FFE-66301E0B076B} = {B190887E-C6D6-4534-A740-02C266DAD316}
+		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4} = {B190887E-C6D6-4534-A740-02C266DAD316}
+		{5CB1D123-853E-4FE7-9484-AAAD7330897C} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{21E44CA2-5355-4092-9EF7-A94520EBDD40} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{EFC0C2A3-1F51-4299-BE43-78284F6AC670} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{8CBDDA63-8388-42AF-934E-7C60832A9B1C} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{26C61EB7-2798-4314-B750-8CD2837D4216} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{5B866430-6F0B-49F1-8294-7B07F766797A} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{03A8EBF2-F912-480F-99E1-34A9A33DD525} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{A00E22C3-A552-4F4C-AF2C-813B96A54582} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{B25AD126-F78D-45CC-AD06-6F1E03D570DA} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{6824AD93-4154-4710-A018-81DA1FA98C40} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{84E43ED2-A2ED-49F9-B592-92270F0F2EC3} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{B1B505DC-F049-4082-8A24-0CB08B99ACAC} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{C77305BE-823E-487F-825E-9C26E0674CC6} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{83270DD0-3E9F-460B-8EAA-4F33A6EB9025} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
+		{2CD88C05-D0CB-49FE-B1D8-341BFDAE4BEF} = {D94A88BA-8E38-469B-AE38-A7967469D7AB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {830494DE-07B3-4C63-9D74-4A123677D469}
diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
index a2ec3b0599f575..d23a01019f9721 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
@@ -73,6 +73,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{38313D23-EB52-423C-9369-42995954CFCA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{72B714E7-81AF-4B9F-B336-1E7DC85B7607}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{F50B881E-8A70-48C3-80B0-2094F6868974}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5D0D6749-312A-4400-89D8-A7252D9A879B}"
@@ -93,21 +95,25 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{5D106629-5F00-4CAF-B3DA-D880AADC2D75}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{23F4102D-67BD-4865-BB19-195C47945733}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{3F13695C-B0A6-4589-A0DE-CA593ECD489A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{41234DB5-1F3A-4E4A-8BD9-4A277C249666}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{6CDFD705-28EC-4D58-A2F9-715A3B06661B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC224BF8-12E5-4992-B750-B12011238C26}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A080529D-6BF1-47FB-8761-49FD666F7956}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5FA865A3-72C7-4E98-8F54-E435FACD4576}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76107BEB-02C0-4A83-9631-B226340752A7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -115,18 +121,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F40120E8-831C-4BC8-B012-997464CEA782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F40120E8-831C-4BC8-B012-997464CEA782}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F40120E8-831C-4BC8-B012-997464CEA782}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F40120E8-831C-4BC8-B012-997464CEA782}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A786592E-9550-4091-9697-FDCD6FFFDA88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A786592E-9550-4091-9697-FDCD6FFFDA88}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A786592E-9550-4091-9697-FDCD6FFFDA88}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A786592E-9550-4091-9697-FDCD6FFFDA88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E971240B-FAB5-4C6D-8742-3E22C17913EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F40120E8-831C-4BC8-B012-997464CEA782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F40120E8-831C-4BC8-B012-997464CEA782}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F40120E8-831C-4BC8-B012-997464CEA782}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F40120E8-831C-4BC8-B012-997464CEA782}.Release|Any CPU.Build.0 = Release|Any CPU
 		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -147,34 +153,34 @@ Global
 		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6242406A-B80A-43EA-A589-F3C665F23662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6242406A-B80A-43EA-A589-F3C665F23662}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6242406A-B80A-43EA-A589-F3C665F23662}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6242406A-B80A-43EA-A589-F3C665F23662}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6242406A-B80A-43EA-A589-F3C665F23662}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6242406A-B80A-43EA-A589-F3C665F23662}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6242406A-B80A-43EA-A589-F3C665F23662}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6242406A-B80A-43EA-A589-F3C665F23662}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3468613D-25D9-43DE-9A43-42E4E070E6F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3468613D-25D9-43DE-9A43-42E4E070E6F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3468613D-25D9-43DE-9A43-42E4E070E6F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3468613D-25D9-43DE-9A43-42E4E070E6F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACFDD440-9823-4590-98FA-5C3E0832330D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8F234107-D9B1-4678-A5FA-FDBBDC85204A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F234107-D9B1-4678-A5FA-FDBBDC85204A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8F234107-D9B1-4678-A5FA-FDBBDC85204A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -183,6 +189,14 @@ Global
 		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D4008AFA-F81B-4879-A059-438355A77754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4008AFA-F81B-4879-A059-438355A77754}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4008AFA-F81B-4879-A059-438355A77754}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -191,30 +205,10 @@ Global
 		{5B95C1F6-D554-4E4A-8DD1-744662F41987}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B95C1F6-D554-4E4A-8DD1-744662F41987}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B95C1F6-D554-4E4A-8DD1-744662F41987}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC87683C-72A1-47BA-B1FE-CBA0D7664896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC87683C-72A1-47BA-B1FE-CBA0D7664896}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC87683C-72A1-47BA-B1FE-CBA0D7664896}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC87683C-72A1-47BA-B1FE-CBA0D7664896}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75A03875-DC97-42AE-9EFE-78DC736B8BD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F29D582-1B4F-4213-B268-CDC3A8945D38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17930AA2-597B-4BB3-8156-720AFB469720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17930AA2-597B-4BB3-8156-720AFB469720}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17930AA2-597B-4BB3-8156-720AFB469720}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17930AA2-597B-4BB3-8156-720AFB469720}.Release|Any CPU.Build.0 = Release|Any CPU
 		{592CD515-9398-47AA-987A-99278C4253EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{592CD515-9398-47AA-987A-99278C4253EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{592CD515-9398-47AA-987A-99278C4253EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -223,26 +217,46 @@ Global
 		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5C36621-D034-46F9-B8FE-14007EAEEF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5C36621-D034-46F9-B8FE-14007EAEEF55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5C36621-D034-46F9-B8FE-14007EAEEF55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5C36621-D034-46F9-B8FE-14007EAEEF55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17930AA2-597B-4BB3-8156-720AFB469720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17930AA2-597B-4BB3-8156-720AFB469720}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17930AA2-597B-4BB3-8156-720AFB469720}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17930AA2-597B-4BB3-8156-720AFB469720}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAA953EF-6529-4F2C-8F89-C76A05258677}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42C10152-F747-443F-9AC1-5738CB62EA6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42C10152-F747-443F-9AC1-5738CB62EA6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42C10152-F747-443F-9AC1-5738CB62EA6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42C10152-F747-443F-9AC1-5738CB62EA6C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3335B42-0CBE-4351-8365-50013C7E8596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3335B42-0CBE-4351-8365-50013C7E8596}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3335B42-0CBE-4351-8365-50013C7E8596}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3335B42-0CBE-4351-8365-50013C7E8596}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1389CD4-AA69-4BEB-A1B8-FC609931D780}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D0D6749-312A-4400-89D8-A7252D9A879B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D0D6749-312A-4400-89D8-A7252D9A879B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D0D6749-312A-4400-89D8-A7252D9A879B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5D0D6749-312A-4400-89D8-A7252D9A879B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F13695C-B0A6-4589-A0DE-CA593ECD489A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F13695C-B0A6-4589-A0DE-CA593ECD489A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F13695C-B0A6-4589-A0DE-CA593ECD489A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F13695C-B0A6-4589-A0DE-CA593ECD489A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3335B42-0CBE-4351-8365-50013C7E8596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3335B42-0CBE-4351-8365-50013C7E8596}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3335B42-0CBE-4351-8365-50013C7E8596}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3335B42-0CBE-4351-8365-50013C7E8596}.Release|Any CPU.Build.0 = Release|Any CPU
+		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F74DB3B7-243F-447D-AE39-672348F661A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F74DB3B7-243F-447D-AE39-672348F661A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F74DB3B7-243F-447D-AE39-672348F661A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -251,42 +265,42 @@ Global
 		{23F4102D-67BD-4865-BB19-195C47945733}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23F4102D-67BD-4865-BB19-195C47945733}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23F4102D-67BD-4865-BB19-195C47945733}.Release|Any CPU.Build.0 = Release|Any CPU
-		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{95FB3CCD-3174-4BAA-8BF6-67E0A16B8965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{95FB3CCD-3174-4BAA-8BF6-67E0A16B8965}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95FB3CCD-3174-4BAA-8BF6-67E0A16B8965}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95FB3CCD-3174-4BAA-8BF6-67E0A16B8965}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F65DFBB-9196-4E69-879A-C99C641B3E49}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53E4909F-FC0B-4727-A73D-686C5115E8C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{53E4909F-FC0B-4727-A73D-686C5115E8C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53E4909F-FC0B-4727-A73D-686C5115E8C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53E4909F-FC0B-4727-A73D-686C5115E8C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDC60461-56B7-4941-AD08-90228BD450CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDC60461-56B7-4941-AD08-90228BD450CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D106629-5F00-4CAF-B3DA-D880AADC2D75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D106629-5F00-4CAF-B3DA-D880AADC2D75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D106629-5F00-4CAF-B3DA-D880AADC2D75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D106629-5F00-4CAF-B3DA-D880AADC2D75}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32CE4366-07A8-4874-9A12-46D5430A2203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32CE4366-07A8-4874-9A12-46D5430A2203}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{32CE4366-07A8-4874-9A12-46D5430A2203}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32CE4366-07A8-4874-9A12-46D5430A2203}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F50B881E-8A70-48C3-80B0-2094F6868974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F50B881E-8A70-48C3-80B0-2094F6868974}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F50B881E-8A70-48C3-80B0-2094F6868974}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -307,6 +321,10 @@ Global
 		{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72B714E7-81AF-4B9F-B336-1E7DC85B7607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72B714E7-81AF-4B9F-B336-1E7DC85B7607}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72B714E7-81AF-4B9F-B336-1E7DC85B7607}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72B714E7-81AF-4B9F-B336-1E7DC85B7607}.Release|Any CPU.Build.0 = Release|Any CPU
 		{38313D23-EB52-423C-9369-42995954CFCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{38313D23-EB52-423C-9369-42995954CFCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{38313D23-EB52-423C-9369-42995954CFCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -328,58 +346,61 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{F40120E8-831C-4BC8-B012-997464CEA782} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{8C395040-9876-47BE-A2EE-4485A6815F89} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{EC8DB110-890E-4388-97FC-0E25D98BC6F4} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{D4008AFA-F81B-4879-A059-438355A77754} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{5B95C1F6-D554-4E4A-8DD1-744662F41987} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{F1389CD4-AA69-4BEB-A1B8-FC609931D780} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{8F29D582-1B4F-4213-B268-CDC3A8945D38} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{17930AA2-597B-4BB3-8156-720AFB469720} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{592CD515-9398-47AA-987A-99278C4253EC} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{E5C36621-D034-46F9-B8FE-14007EAEEF55} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{C3335B42-0CBE-4351-8365-50013C7E8596} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{5D0D6749-312A-4400-89D8-A7252D9A879B} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{F74DB3B7-243F-447D-AE39-672348F661A1} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{53E4909F-FC0B-4727-A73D-686C5115E8C9} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{32CE4366-07A8-4874-9A12-46D5430A2203} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{8EA7F25A-0748-4EF4-ABE8-67688B646D47} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{6CDFD705-28EC-4D58-A2F9-715A3B06661B} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{52B5874C-5860-473C-9A7D-8F70C01A0EBF} = {DC224BF8-12E5-4992-B750-B12011238C26}
-		{E971240B-FAB5-4C6D-8742-3E22C17913EA} = {CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78}
-		{A786592E-9550-4091-9697-FDCD6FFFDA88} = {CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78}
-		{6B148547-AC7D-45DC-A059-064D72A6E501} = {CEC96DEF-9D43-4EFC-962B-B4F80EFA5C78}
-		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{6242406A-B80A-43EA-A589-F3C665F23662} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{3468613D-25D9-43DE-9A43-42E4E070E6F6} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{ACFDD440-9823-4590-98FA-5C3E0832330D} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{8F234107-D9B1-4678-A5FA-FDBBDC85204A} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{EC87683C-72A1-47BA-B1FE-CBA0D7664896} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{75A03875-DC97-42AE-9EFE-78DC736B8BD6} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{41234DB5-1F3A-4E4A-8BD9-4A277C249666} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{BAA953EF-6529-4F2C-8F89-C76A05258677} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{42C10152-F747-443F-9AC1-5738CB62EA6C} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{23F4102D-67BD-4865-BB19-195C47945733} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{CDC60461-56B7-4941-AD08-90228BD450CE} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{8F65DFBB-9196-4E69-879A-C99C641B3E49} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{95FB3CCD-3174-4BAA-8BF6-67E0A16B8965} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{F50B881E-8A70-48C3-80B0-2094F6868974} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{269B535C-B21D-4D39-BC91-44B33279CB7A} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{38313D23-EB52-423C-9369-42995954CFCA} = {76107BEB-02C0-4A83-9631-B226340752A7}
-		{9DC9CC89-E2F2-41F6-8684-81AA41B469FF} = {76107BEB-02C0-4A83-9631-B226340752A7}
+		{A786592E-9550-4091-9697-FDCD6FFFDA88} = {A080529D-6BF1-47FB-8761-49FD666F7956}
+		{E971240B-FAB5-4C6D-8742-3E22C17913EA} = {A080529D-6BF1-47FB-8761-49FD666F7956}
+		{6B148547-AC7D-45DC-A059-064D72A6E501} = {A080529D-6BF1-47FB-8761-49FD666F7956}
+		{F40120E8-831C-4BC8-B012-997464CEA782} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{8C395040-9876-47BE-A2EE-4485A6815F89} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{EC8DB110-890E-4388-97FC-0E25D98BC6F4} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{8F29D582-1B4F-4213-B268-CDC3A8945D38} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{D4008AFA-F81B-4879-A059-438355A77754} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{5B95C1F6-D554-4E4A-8DD1-744662F41987} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{592CD515-9398-47AA-987A-99278C4253EC} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{E5C36621-D034-46F9-B8FE-14007EAEEF55} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{17930AA2-597B-4BB3-8156-720AFB469720} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{F1389CD4-AA69-4BEB-A1B8-FC609931D780} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{5D0D6749-312A-4400-89D8-A7252D9A879B} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{3F13695C-B0A6-4589-A0DE-CA593ECD489A} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{C3335B42-0CBE-4351-8365-50013C7E8596} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{F74DB3B7-243F-447D-AE39-672348F661A1} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{53E4909F-FC0B-4727-A73D-686C5115E8C9} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{5D106629-5F00-4CAF-B3DA-D880AADC2D75} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{32CE4366-07A8-4874-9A12-46D5430A2203} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{8EA7F25A-0748-4EF4-ABE8-67688B646D47} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{6CDFD705-28EC-4D58-A2F9-715A3B06661B} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{72B714E7-81AF-4B9F-B336-1E7DC85B7607} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{52B5874C-5860-473C-9A7D-8F70C01A0EBF} = {5FA865A3-72C7-4E98-8F54-E435FACD4576}
+		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{6242406A-B80A-43EA-A589-F3C665F23662} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{ACFDD440-9823-4590-98FA-5C3E0832330D} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{3468613D-25D9-43DE-9A43-42E4E070E6F6} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{8F234107-D9B1-4678-A5FA-FDBBDC85204A} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{75A03875-DC97-42AE-9EFE-78DC736B8BD6} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{EC87683C-72A1-47BA-B1FE-CBA0D7664896} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{41234DB5-1F3A-4E4A-8BD9-4A277C249666} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{BAA953EF-6529-4F2C-8F89-C76A05258677} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{42C10152-F747-443F-9AC1-5738CB62EA6C} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{634542E9-CF9A-4BD2-BC36-71D12BEF2B36} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{23F4102D-67BD-4865-BB19-195C47945733} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{95FB3CCD-3174-4BAA-8BF6-67E0A16B8965} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{8F65DFBB-9196-4E69-879A-C99C641B3E49} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{CDC60461-56B7-4941-AD08-90228BD450CE} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{F50B881E-8A70-48C3-80B0-2094F6868974} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{269B535C-B21D-4D39-BC91-44B33279CB7A} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{38313D23-EB52-423C-9369-42995954CFCA} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
+		{9DC9CC89-E2F2-41F6-8684-81AA41B469FF} = {2FC3A46E-90AB-448E-9A3C-105A8B43DFF3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {81EEF2A5-6387-4CC4-B7CD-908EEA4E5C79}
diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
index 6510d1b3940139..978378ec04907d 100644
--- a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
@@ -17,17 +17,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4A28B457-D950-486B-B59B-A4C977A733B1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{97AB4A8D-C0D0-4F19-9B43-CD7E3CBCD6E4}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{7902A0CA-E94D-4C96-A112-455A1E5E2390}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{E9581D82-320F-4446-8B0B-FF64A85F1777}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{FA7201FE-097D-4197-BDEC-329986814D8D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50BA55F5-BD05-4C05-910F-2BFD20BD3465}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{61EC962F-E956-4EB3-A3F9-266E3FDD6217}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{155C3F40-F63D-49DF-87D3-A3EEA27036E8}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CA39EF46-3F88-4E94-97ED-EC9694BF0E61}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5725D7DF-DC33-47D2-90C9-D8736C579E77}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,6 +71,14 @@ Global
 		{4A28B457-D950-486B-B59B-A4C977A733B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4A28B457-D950-486B-B59B-A4C977A733B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4A28B457-D950-486B-B59B-A4C977A733B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9581D82-320F-4446-8B0B-FF64A85F1777}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9581D82-320F-4446-8B0B-FF64A85F1777}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9581D82-320F-4446-8B0B-FF64A85F1777}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9581D82-320F-4446-8B0B-FF64A85F1777}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,10 +87,10 @@ Global
 		{F38E2965-8DBB-4795-89AF-C0109EB23574}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F38E2965-8DBB-4795-89AF-C0109EB23574}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F38E2965-8DBB-4795-89AF-C0109EB23574}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97AB4A8D-C0D0-4F19-9B43-CD7E3CBCD6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97AB4A8D-C0D0-4F19-9B43-CD7E3CBCD6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97AB4A8D-C0D0-4F19-9B43-CD7E3CBCD6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97AB4A8D-C0D0-4F19-9B43-CD7E3CBCD6E4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{696D69C9-C5F6-405E-A8B5-5375D08BBADC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -88,18 +100,20 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
-		{F38E2965-8DBB-4795-89AF-C0109EB23574} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
-		{696D69C9-C5F6-405E-A8B5-5375D08BBADC} = {50BA55F5-BD05-4C05-910F-2BFD20BD3465}
-		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8}
-		{5351C410-530D-4724-A8E6-430831E7332B} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8}
-		{E5B6A94F-615E-4DAF-8110-E5A776BB8296} = {155C3F40-F63D-49DF-87D3-A3EEA27036E8}
-		{5C580568-6072-4F27-B5C6-FA04556E3B98} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
-		{FA7201FE-097D-4197-BDEC-329986814D8D} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
-		{7902A0CA-E94D-4C96-A112-455A1E5E2390} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
-		{4A28B457-D950-486B-B59B-A4C977A733B1} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
-		{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
-		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {5725D7DF-DC33-47D2-90C9-D8736C579E77}
+		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6} = {61EC962F-E956-4EB3-A3F9-266E3FDD6217}
+		{E9581D82-320F-4446-8B0B-FF64A85F1777} = {61EC962F-E956-4EB3-A3F9-266E3FDD6217}
+		{F38E2965-8DBB-4795-89AF-C0109EB23574} = {61EC962F-E956-4EB3-A3F9-266E3FDD6217}
+		{97AB4A8D-C0D0-4F19-9B43-CD7E3CBCD6E4} = {61EC962F-E956-4EB3-A3F9-266E3FDD6217}
+		{696D69C9-C5F6-405E-A8B5-5375D08BBADC} = {61EC962F-E956-4EB3-A3F9-266E3FDD6217}
+		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58} = {CA39EF46-3F88-4E94-97ED-EC9694BF0E61}
+		{5351C410-530D-4724-A8E6-430831E7332B} = {CA39EF46-3F88-4E94-97ED-EC9694BF0E61}
+		{E5B6A94F-615E-4DAF-8110-E5A776BB8296} = {CA39EF46-3F88-4E94-97ED-EC9694BF0E61}
+		{5C580568-6072-4F27-B5C6-FA04556E3B98} = {7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}
+		{FA7201FE-097D-4197-BDEC-329986814D8D} = {7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}
+		{7902A0CA-E94D-4C96-A112-455A1E5E2390} = {7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}
+		{4A28B457-D950-486B-B59B-A4C977A733B1} = {7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}
+		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}
+		{6699E51A-8DC5-4DBA-A06B-B4A04144E4FA} = {7436279E-7BAF-4BCD-ADEF-FE438CFD4A05}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {810D114A-26F4-4151-9EFE-29A7F1BF62AA}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
index 4d180d0e8e5926..35a12945efff5d 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.Systemd/Microsoft.Extensions.Hosting.Systemd.sln
@@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{807B54D5-5807-4D9C-BD26-ECE5B12AECE4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{58605A6B-7042-4F0E-A640-6658537D1C0C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{3488D63C-0C29-442C-8145-407DE19C7480}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}"
@@ -129,10 +131,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{06EA5776-26ED-49A2-BC79-019D0DCBD75B}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{CA49BE02-D809-4F18-8E0B-54FA365429E3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{E359EFC2-9E1C-4643-B3D0-513D0A38E27D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{6061433D-2A71-47B3-B34B-3EDF523ABB78}"
@@ -141,11 +147,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{468E211B-6F29-47C8-8735-50374B2FC5B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9504A671-7FF4-41AA-AF67-5EBD0CF86561}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7F45D42D-B56E-44BA-8D93-A0DB63442915}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{192FD259-E55F-40C5-82EE-9E924EA6C3CB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4672489E-41A0-4E1C-B691-2F7271BBC641}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -153,6 +159,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89B0BB58-C3A6-474B-8D32-6D3918DA03D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89B0BB58-C3A6-474B-8D32-6D3918DA03D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89B0BB58-C3A6-474B-8D32-6D3918DA03D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -161,14 +171,6 @@ Global
 		{1CC22FE5-BF97-42AB-9EDB-884CCA5B24B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1CC22FE5-BF97-42AB-9EDB-884CCA5B24B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CC22FE5-BF97-42AB-9EDB-884CCA5B24B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Release|Any CPU.Build.0 = Release|Any CPU
 		{93D90E13-0DD3-4468-9FB0-19BD70DAA83D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{93D90E13-0DD3-4468-9FB0-19BD70DAA83D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{93D90E13-0DD3-4468-9FB0-19BD70DAA83D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -177,10 +179,58 @@ Global
 		{827A7E31-1D06-46D1-B875-536513E2D03A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{827A7E31-1D06-46D1-B875-536513E2D03A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{827A7E31-1D06-46D1-B875-536513E2D03A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFC1BDAA-7E40-4118-BB80-F8057752A600}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{860B845B-929F-4442-AED1-1F4186DBF497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{860B845B-929F-4442-AED1-1F4186DBF497}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{860B845B-929F-4442-AED1-1F4186DBF497}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{860B845B-929F-4442-AED1-1F4186DBF497}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7CE3965-1680-4A05-8239-BD58B047F028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7CE3965-1680-4A05-8239-BD58B047F028}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7CE3965-1680-4A05-8239-BD58B047F028}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7CE3965-1680-4A05-8239-BD58B047F028}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8C25E82-EF3B-4448-939B-781FEC478870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8C25E82-EF3B-4448-939B-781FEC478870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8C25E82-EF3B-4448-939B-781FEC478870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8C25E82-EF3B-4448-939B-781FEC478870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23B739AD-9913-41C5-AEF2-0A233760FACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23B739AD-9913-41C5-AEF2-0A233760FACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23B739AD-9913-41C5-AEF2-0A233760FACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23B739AD-9913-41C5-AEF2-0A233760FACB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0789D138-6900-4E23-8A40-3A507B1229A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0789D138-6900-4E23-8A40-3A507B1229A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0789D138-6900-4E23-8A40-3A507B1229A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -189,246 +239,214 @@ Global
 		{179B28E8-3755-438F-AC0B-F41ECB96508A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{179B28E8-3755-438F-AC0B-F41ECB96508A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{179B28E8-3755-438F-AC0B-F41ECB96508A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE8EDD88-76E2-4154-A41C-45B2004634BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FAF7C83-659D-4262-B828-844E99090E21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FAF7C83-659D-4262-B828-844E99090E21}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FAF7C83-659D-4262-B828-844E99090E21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FAF7C83-659D-4262-B828-844E99090E21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72D66519-79C0-47C2-91AB-888465D7510D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{72D66519-79C0-47C2-91AB-888465D7510D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{72D66519-79C0-47C2-91AB-888465D7510D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72D66519-79C0-47C2-91AB-888465D7510D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0ADD390-3C63-41D9-823D-803D23D94DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F0ADD390-3C63-41D9-823D-803D23D94DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0ADD390-3C63-41D9-823D-803D23D94DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F0ADD390-3C63-41D9-823D-803D23D94DF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Release|Any CPU.Build.0 = Release|Any CPU
+		{410F3407-0106-442D-9BA2-88395D62BF2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{410F3407-0106-442D-9BA2-88395D62BF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{410F3407-0106-442D-9BA2-88395D62BF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{410F3407-0106-442D-9BA2-88395D62BF2C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D2145F9-AE33-4873-99BF-F0E0B7457F35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D2145F9-AE33-4873-99BF-F0E0B7457F35}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D2145F9-AE33-4873-99BF-F0E0B7457F35}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D2145F9-AE33-4873-99BF-F0E0B7457F35}.Release|Any CPU.Build.0 = Release|Any CPU
-		{410F3407-0106-442D-9BA2-88395D62BF2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{410F3407-0106-442D-9BA2-88395D62BF2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{410F3407-0106-442D-9BA2-88395D62BF2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{410F3407-0106-442D-9BA2-88395D62BF2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B72FC27-F786-44B4-88DF-996D478873B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B72FC27-F786-44B4-88DF-996D478873B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B72FC27-F786-44B4-88DF-996D478873B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B72FC27-F786-44B4-88DF-996D478873B8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75BE42D7-1A41-46DF-941A-45F1B1FAC09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{75BE42D7-1A41-46DF-941A-45F1B1FAC09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{75BE42D7-1A41-46DF-941A-45F1B1FAC09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{75BE42D7-1A41-46DF-941A-45F1B1FAC09E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9FF7864-8BBD-4345-830E-D812E7F2B863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C206A9B3-F9FE-4771-93F4-7AC7930CF844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C206A9B3-F9FE-4771-93F4-7AC7930CF844}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C206A9B3-F9FE-4771-93F4-7AC7930CF844}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C206A9B3-F9FE-4771-93F4-7AC7930CF844}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{860B845B-929F-4442-AED1-1F4186DBF497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{860B845B-929F-4442-AED1-1F4186DBF497}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{860B845B-929F-4442-AED1-1F4186DBF497}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{860B845B-929F-4442-AED1-1F4186DBF497}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7CE3965-1680-4A05-8239-BD58B047F028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7CE3965-1680-4A05-8239-BD58B047F028}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7CE3965-1680-4A05-8239-BD58B047F028}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7CE3965-1680-4A05-8239-BD58B047F028}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3765CD5F-C4BF-40F4-8223-0434957D49E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8C25E82-EF3B-4448-939B-781FEC478870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8C25E82-EF3B-4448-939B-781FEC478870}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8C25E82-EF3B-4448-939B-781FEC478870}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8C25E82-EF3B-4448-939B-781FEC478870}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B5BA863-7777-471F-8393-EBBD41D10D9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFDC7964-D436-4B9D-92AD-8B71A1298937}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1053E73-AB5D-4593-8E00-7E048C314A28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A8E8E0F-5441-40F3-8C6E-ADF557156100}.Release|Any CPU.Build.0 = Release|Any CPU
+		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E436D227-3000-481E-BCA0-9D6FE45007C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E436D227-3000-481E-BCA0-9D6FE45007C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E436D227-3000-481E-BCA0-9D6FE45007C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E436D227-3000-481E-BCA0-9D6FE45007C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7387064-C6EB-438E-8893-4F478403E568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7387064-C6EB-438E-8893-4F478403E568}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7387064-C6EB-438E-8893-4F478403E568}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7387064-C6EB-438E-8893-4F478403E568}.Release|Any CPU.Build.0 = Release|Any CPU
 		{807B54D5-5807-4D9C-BD26-ECE5B12AECE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{807B54D5-5807-4D9C-BD26-ECE5B12AECE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{807B54D5-5807-4D9C-BD26-ECE5B12AECE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{807B54D5-5807-4D9C-BD26-ECE5B12AECE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7387064-C6EB-438E-8893-4F478403E568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7387064-C6EB-438E-8893-4F478403E568}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7387064-C6EB-438E-8893-4F478403E568}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7387064-C6EB-438E-8893-4F478403E568}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD534639-6085-4E62-A608-9EB7227D8A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD534639-6085-4E62-A608-9EB7227D8A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD534639-6085-4E62-A608-9EB7227D8A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD534639-6085-4E62-A608-9EB7227D8A62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0F58507-0DEC-49BB-BF3F-0746541A852F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{331A436E-174F-49FD-BDCE-93F2EE43FBF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{331A436E-174F-49FD-BDCE-93F2EE43FBF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{331A436E-174F-49FD-BDCE-93F2EE43FBF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{331A436E-174F-49FD-BDCE-93F2EE43FBF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39F3B025-A40A-48F7-9ECA-D5597318E8D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39F3B025-A40A-48F7-9ECA-D5597318E8D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39F3B025-A40A-48F7-9ECA-D5597318E8D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39F3B025-A40A-48F7-9ECA-D5597318E8D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B90E8F51-9F39-4D97-99DB-6AC9AB5C61B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B90E8F51-9F39-4D97-99DB-6AC9AB5C61B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B90E8F51-9F39-4D97-99DB-6AC9AB5C61B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B90E8F51-9F39-4D97-99DB-6AC9AB5C61B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3488D63C-0C29-442C-8145-407DE19C7480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3488D63C-0C29-442C-8145-407DE19C7480}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3488D63C-0C29-442C-8145-407DE19C7480}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3488D63C-0C29-442C-8145-407DE19C7480}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9CF78299-3EDD-4C15-9FC0-979B27304691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9CF78299-3EDD-4C15-9FC0-979B27304691}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9CF78299-3EDD-4C15-9FC0-979B27304691}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9CF78299-3EDD-4C15-9FC0-979B27304691}.Release|Any CPU.Build.0 = Release|Any CPU
-		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1085690E-319E-4182-86D3-444024A88584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1085690E-319E-4182-86D3-444024A88584}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1085690E-319E-4182-86D3-444024A88584}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1085690E-319E-4182-86D3-444024A88584}.Release|Any CPU.Build.0 = Release|Any CPU
-		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{094CFE91-F40F-443D-B53A-EC7FE3D4F464}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{671BDDDE-D22A-4FDB-A298-685295DA50D1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{578661A4-C136-4533-819E-AF3352F79953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{578661A4-C136-4533-819E-AF3352F79953}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{578661A4-C136-4533-819E-AF3352F79953}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{578661A4-C136-4533-819E-AF3352F79953}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD24AFAB-7F9F-4534-88E3-82006BC0068C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3749C284-FC40-47F1-BCAA-F9261455F3B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DF59630-9CE6-49CD-AF5F-F97742066784}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E359EFC2-9E1C-4643-B3D0-513D0A38E27D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E359EFC2-9E1C-4643-B3D0-513D0A38E27D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E359EFC2-9E1C-4643-B3D0-513D0A38E27D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E359EFC2-9E1C-4643-B3D0-513D0A38E27D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1ACBD81-9577-483B-8E33-819F1313114A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1ACBD81-9577-483B-8E33-819F1313114A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1ACBD81-9577-483B-8E33-819F1313114A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1ACBD81-9577-483B-8E33-819F1313114A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{21490CC4-3308-4AFC-BA6B-9A2B828717BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{21490CC4-3308-4AFC-BA6B-9A2B828717BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{21490CC4-3308-4AFC-BA6B-9A2B828717BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{21490CC4-3308-4AFC-BA6B-9A2B828717BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1ACBD81-9577-483B-8E33-819F1313114A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1ACBD81-9577-483B-8E33-819F1313114A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1ACBD81-9577-483B-8E33-819F1313114A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1ACBD81-9577-483B-8E33-819F1313114A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA49BE02-D809-4F18-8E0B-54FA365429E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58605A6B-7042-4F0E-A640-6658537D1C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58605A6B-7042-4F0E-A640-6658537D1C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58605A6B-7042-4F0E-A640-6658537D1C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58605A6B-7042-4F0E-A640-6658537D1C0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06EA5776-26ED-49A2-BC79-019D0DCBD75B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06EA5776-26ED-49A2-BC79-019D0DCBD75B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06EA5776-26ED-49A2-BC79-019D0DCBD75B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06EA5776-26ED-49A2-BC79-019D0DCBD75B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6061433D-2A71-47B3-B34B-3EDF523ABB78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6061433D-2A71-47B3-B34B-3EDF523ABB78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6061433D-2A71-47B3-B34B-3EDF523ABB78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6061433D-2A71-47B3-B34B-3EDF523ABB78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534}.Release|Any CPU.Build.0 = Release|Any CPU
 		{468E211B-6F29-47C8-8735-50374B2FC5B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{468E211B-6F29-47C8-8735-50374B2FC5B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{468E211B-6F29-47C8-8735-50374B2FC5B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -442,77 +460,80 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{89B0BB58-C3A6-474B-8D32-6D3918DA03D6} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{827A7E31-1D06-46D1-B875-536513E2D03A} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{C9FF7864-8BBD-4345-830E-D812E7F2B863} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{860B845B-929F-4442-AED1-1F4186DBF497} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{C7CE3965-1680-4A05-8239-BD58B047F028} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{3765CD5F-C4BF-40F4-8223-0434957D49E5} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{B8C25E82-EF3B-4448-939B-781FEC478870} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{0B5BA863-7777-471F-8393-EBBD41D10D9E} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{E436D227-3000-481E-BCA0-9D6FE45007C7} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{B0F58507-0DEC-49BB-BF3F-0746541A852F} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{E7387064-C6EB-438E-8893-4F478403E568} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{BD534639-6085-4E62-A608-9EB7227D8A62} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{331A436E-174F-49FD-BDCE-93F2EE43FBF6} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{39F3B025-A40A-48F7-9ECA-D5597318E8D3} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{B90E8F51-9F39-4D97-99DB-6AC9AB5C61B4} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{5DF59630-9CE6-49CD-AF5F-F97742066784} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{9CF78299-3EDD-4C15-9FC0-979B27304691} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{671BDDDE-D22A-4FDB-A298-685295DA50D1} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{1085690E-319E-4182-86D3-444024A88584} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{094CFE91-F40F-443D-B53A-EC7FE3D4F464} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{AD24AFAB-7F9F-4534-88E3-82006BC0068C} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{3749C284-FC40-47F1-BCAA-F9261455F3B6} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{21490CC4-3308-4AFC-BA6B-9A2B828717BE} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{6061433D-2A71-47B3-B34B-3EDF523ABB78} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{468E211B-6F29-47C8-8735-50374B2FC5B8} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{64A361E0-27B4-43F3-9BBA-3EE32D6807D4} = {087E4FD9-3846-4EE2-A8E5-28BD1CCA777C}
-		{1CC22FE5-BF97-42AB-9EDB-884CCA5B24B9} = {9504A671-7FF4-41AA-AF67-5EBD0CF86561}
-		{93D90E13-0DD3-4468-9FB0-19BD70DAA83D} = {9504A671-7FF4-41AA-AF67-5EBD0CF86561}
-		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{AFC1BDAA-7E40-4118-BB80-F8057752A600} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{23B739AD-9913-41C5-AEF2-0A233760FACB} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{0789D138-6900-4E23-8A40-3A507B1229A8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{179B28E8-3755-438F-AC0B-F41ECB96508A} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{CE8EDD88-76E2-4154-A41C-45B2004634BD} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{4FAF7C83-659D-4262-B828-844E99090E21} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{72D66519-79C0-47C2-91AB-888465D7510D} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{F0ADD390-3C63-41D9-823D-803D23D94DF4} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{1D2145F9-AE33-4873-99BF-F0E0B7457F35} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{410F3407-0106-442D-9BA2-88395D62BF2C} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{4B72FC27-F786-44B4-88DF-996D478873B8} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{75BE42D7-1A41-46DF-941A-45F1B1FAC09E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{8A8E8E0F-5441-40F3-8C6E-ADF557156100} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{CFDC7964-D436-4B9D-92AD-8B71A1298937} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{C206A9B3-F9FE-4771-93F4-7AC7930CF844} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{E1053E73-AB5D-4593-8E00-7E048C314A28} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{807B54D5-5807-4D9C-BD26-ECE5B12AECE4} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{3488D63C-0C29-442C-8145-407DE19C7480} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{578661A4-C136-4533-819E-AF3352F79953} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{CA49BE02-D809-4F18-8E0B-54FA365429E3} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{C1ACBD81-9577-483B-8E33-819F1313114A} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
-		{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129} = {192FD259-E55F-40C5-82EE-9E924EA6C3CB}
+		{CFF29AA4-794A-416B-BF4C-FD2A442FB83F} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{AFC1BDAA-7E40-4118-BB80-F8057752A600} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{E1053E73-AB5D-4593-8E00-7E048C314A28} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{23B739AD-9913-41C5-AEF2-0A233760FACB} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{CE8EDD88-76E2-4154-A41C-45B2004634BD} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{0789D138-6900-4E23-8A40-3A507B1229A8} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{179B28E8-3755-438F-AC0B-F41ECB96508A} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{4FAF7C83-659D-4262-B828-844E99090E21} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{C722A5A2-0004-4625-A2B6-CE2F11C6FC00} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{72D66519-79C0-47C2-91AB-888465D7510D} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{D8C3A422-16FC-4992-A501-EE53DAA0EDD1} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{F0ADD390-3C63-41D9-823D-803D23D94DF4} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{4067DFDE-ECAE-42EE-BFC9-920BC95B2109} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{410F3407-0106-442D-9BA2-88395D62BF2C} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{AF0F4768-8A3D-42CF-ACA9-79E989EB4A72} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{1D2145F9-AE33-4873-99BF-F0E0B7457F35} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{4B72FC27-F786-44B4-88DF-996D478873B8} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{A0AF82AE-ED18-4EEB-AD9A-B44017510F0C} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{75BE42D7-1A41-46DF-941A-45F1B1FAC09E} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{D61B6530-0055-4DFE-85D1-58BEDFC7AA2F} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{C206A9B3-F9FE-4771-93F4-7AC7930CF844} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{CFDC7964-D436-4B9D-92AD-8B71A1298937} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{0ABC0B71-96A4-43A0-9DCF-40F3F34095A3} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{8A8E8E0F-5441-40F3-8C6E-ADF557156100} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{509B5AB4-8F9F-4856-811F-7C8E727BF2E6} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{807B54D5-5807-4D9C-BD26-ECE5B12AECE4} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{9C03BBD2-3EC8-4E82-9C3E-E4C869A65611} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{25474DE2-4D3D-4950-BDA7-CF6FE3CCD940} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{21A8F1A2-DB8F-40BB-8B41-34FFBFF678BE} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{3488D63C-0C29-442C-8145-407DE19C7480} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{2E027B76-275A-4FCE-9774-A2F8C3CD0C7E} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{578661A4-C136-4533-819E-AF3352F79953} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{47A3CDB0-8252-4536-B61F-C2E10F6EC2B9} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{C1ACBD81-9577-483B-8E33-819F1313114A} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{CA49BE02-D809-4F18-8E0B-54FA365429E3} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{01DB5E6D-40C5-42F7-8F9D-6F8DBC591129} = {69FCA2F7-D89E-43AA-84F4-2C19EF9485CF}
+		{89B0BB58-C3A6-474B-8D32-6D3918DA03D6} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{827A7E31-1D06-46D1-B875-536513E2D03A} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{B8625AE9-AEF9-4A41-B208-60F0526BE5B6} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{C9FF7864-8BBD-4345-830E-D812E7F2B863} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{05E9D59A-7FA1-4BE3-953E-F99109AFBCA3} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{AD6AAD5F-8B2E-4FFD-A6D4-A6C9B9078D0D} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{860B845B-929F-4442-AED1-1F4186DBF497} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{C7CE3965-1680-4A05-8239-BD58B047F028} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{3765CD5F-C4BF-40F4-8223-0434957D49E5} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{0B5BA863-7777-471F-8393-EBBD41D10D9E} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{B8C25E82-EF3B-4448-939B-781FEC478870} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{9BB5C616-37A1-474B-B3B5-202DA5B1BE74} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{AD24AFAB-7F9F-4534-88E3-82006BC0068C} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{1A3EF133-CC86-4CC9-BBB8-333D41563AC3} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{3749C284-FC40-47F1-BCAA-F9261455F3B6} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{E436D227-3000-481E-BCA0-9D6FE45007C7} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{E7387064-C6EB-438E-8893-4F478403E568} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{BD534639-6085-4E62-A608-9EB7227D8A62} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{B0F58507-0DEC-49BB-BF3F-0746541A852F} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{331A436E-174F-49FD-BDCE-93F2EE43FBF6} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{39F3B025-A40A-48F7-9ECA-D5597318E8D3} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{B90E8F51-9F39-4D97-99DB-6AC9AB5C61B4} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{094CFE91-F40F-443D-B53A-EC7FE3D4F464} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{9CF78299-3EDD-4C15-9FC0-979B27304691} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{1085690E-319E-4182-86D3-444024A88584} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{671BDDDE-D22A-4FDB-A298-685295DA50D1} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{5DF59630-9CE6-49CD-AF5F-F97742066784} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{E359EFC2-9E1C-4643-B3D0-513D0A38E27D} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{21490CC4-3308-4AFC-BA6B-9A2B828717BE} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{B98B3A59-AEAF-4755-A1FF-2B7A36393BBC} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{58605A6B-7042-4F0E-A640-6658537D1C0C} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{06EA5776-26ED-49A2-BC79-019D0DCBD75B} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{6061433D-2A71-47B3-B34B-3EDF523ABB78} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{B7BFBEDC-68F0-428B-ACA0-6E9861B9E534} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{468E211B-6F29-47C8-8735-50374B2FC5B8} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{64A361E0-27B4-43F3-9BBA-3EE32D6807D4} = {7F45D42D-B56E-44BA-8D93-A0DB63442915}
+		{1CC22FE5-BF97-42AB-9EDB-884CCA5B24B9} = {4672489E-41A0-4E1C-B691-2F7271BBC641}
+		{93D90E13-0DD3-4468-9FB0-19BD70DAA83D} = {4672489E-41A0-4E1C-B691-2F7271BBC641}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {EFB87E5C-C4CE-4855-8CBB-B20180560CB1}
diff --git a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
index d044381432e722..a197016440c4b8 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.WindowsServices/Microsoft.Extensions.Hosting.WindowsServices.sln
@@ -109,6 +109,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{2F2D5292-9A79-4654-A470-2C7E974C4EF0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{05B23435-DB1A-45BC-BAB1-2FA1353A9A1D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}"
@@ -129,10 +131,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.Servi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "..\System.ServiceProcess.ServiceController\src\System.ServiceProcess.ServiceController.csproj", "{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{C9E98C85-C184-4F96-A524-8C6080E7F8EB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{B2DD40E6-3DDC-43EA-8231-9E2C0ADB9B77}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}"
@@ -141,9 +147,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFC0CC54-6781-45CB-865F-72E9FABBD023}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7CD93EC6-E968-4150-93E0-9DDD718795DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{76933DF1-12AA-4B5B-8863-EF38F10B1EC9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EA2BED3A-AB10-4481-A825-C24E3A934A9A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -159,10 +165,10 @@ Global
 		{89A6E38E-1118-4FC6-957D-17751DAD8EAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89A6E38E-1118-4FC6-957D-17751DAD8EAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89A6E38E-1118-4FC6-957D-17751DAD8EAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A7BF932-04A6-458B-8D6F-4F474F553BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A7BF932-04A6-458B-8D6F-4F474F553BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A7BF932-04A6-458B-8D6F-4F474F553BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -171,78 +177,14 @@ Global
 		{FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55B88031-3C95-499F-B2AF-CF531312F1FD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Release|Any CPU.Build.0 = Release|Any CPU
-		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -267,10 +209,6 @@ Global
 		{D7EC07C4-7679-4E97-B3A9-60D03607F758}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7EC07C4-7679-4E97-B3A9-60D03607F758}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7EC07C4-7679-4E97-B3A9-60D03607F758}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{720A0CB6-828B-47EF-BC1C-0B98E52BBFCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{720A0CB6-828B-47EF-BC1C-0B98E52BBFCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{720A0CB6-828B-47EF-BC1C-0B98E52BBFCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -279,82 +217,122 @@ Global
 		{F9745791-BD7B-4337-BE8B-8AEEEB933E84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9745791-BD7B-4337-BE8B-8AEEEB933E84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9745791-BD7B-4337-BE8B-8AEEEB933E84}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07A9935C-015D-43DD-9CDE-809301151F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07A9935C-015D-43DD-9CDE-809301151F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07A9935C-015D-43DD-9CDE-809301151F7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07A9935C-015D-43DD-9CDE-809301151F7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{67A6FA6A-F171-4A00-80ED-113736B2B5B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67A6FA6A-F171-4A00-80ED-113736B2B5B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67A6FA6A-F171-4A00-80ED-113736B2B5B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67A6FA6A-F171-4A00-80ED-113736B2B5B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C913A82A-3C17-4991-8F66-9D9F0B841E5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07A9935C-015D-43DD-9CDE-809301151F7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07A9935C-015D-43DD-9CDE-809301151F7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07A9935C-015D-43DD-9CDE-809301151F7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07A9935C-015D-43DD-9CDE-809301151F7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB7C602E-3ED6-472A-85BD-420B61BA293D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB7C602E-3ED6-472A-85BD-420B61BA293D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB7C602E-3ED6-472A-85BD-420B61BA293D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB7C602E-3ED6-472A-85BD-420B61BA293D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Release|Any CPU.Build.0 = Release|Any CPU
-		{388F4768-2C2B-43F1-910A-E50F47130368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{388F4768-2C2B-43F1-910A-E50F47130368}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{388F4768-2C2B-43F1-910A-E50F47130368}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{388F4768-2C2B-43F1-910A-E50F47130368}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDB95DB9-3E70-4F3E-B9D0-217A14215356}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C573763D-C24C-4222-AAF0-66B0C2260EB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C573763D-C24C-4222-AAF0-66B0C2260EB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C573763D-C24C-4222-AAF0-66B0C2260EB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C573763D-C24C-4222-AAF0-66B0C2260EB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{388F4768-2C2B-43F1-910A-E50F47130368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{388F4768-2C2B-43F1-910A-E50F47130368}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{388F4768-2C2B-43F1-910A-E50F47130368}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{388F4768-2C2B-43F1-910A-E50F47130368}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982}.Release|Any CPU.Build.0 = Release|Any CPU
 		{90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{116CF183-FD4A-4121-AEE9-1DF8C51BF858}.Release|Any CPU.Build.0 = Release|Any CPU
+		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70A40879-BA02-4860-9A55-D13DE8A456D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78706510-4F89-4896-8E29-723C8F4B90AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{78706510-4F89-4896-8E29-723C8F4B90AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{78706510-4F89-4896-8E29-723C8F4B90AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{78706510-4F89-4896-8E29-723C8F4B90AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99E2010C-A3C7-4921-A15C-906C308857F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99E2010C-A3C7-4921-A15C-906C308857F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99E2010C-A3C7-4921-A15C-906C308857F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99E2010C-A3C7-4921-A15C-906C308857F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C114AFF6-377C-4694-B869-3B590317E87A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C114AFF6-377C-4694-B869-3B590317E87A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C114AFF6-377C-4694-B869-3B590317E87A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C114AFF6-377C-4694-B869-3B590317E87A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44AC224A-BB08-434A-9443-A1C98805B582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44AC224A-BB08-434A-9443-A1C98805B582}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44AC224A-BB08-434A-9443-A1C98805B582}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44AC224A-BB08-434A-9443-A1C98805B582}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Release|Any CPU.Build.0 = Release|Any CPU
-		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E08B694-3806-492C-BCEC-7B74420E3041}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E08B694-3806-492C-BCEC-7B74420E3041}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E08B694-3806-492C-BCEC-7B74420E3041}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E08B694-3806-492C-BCEC-7B74420E3041}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F2D5292-9A79-4654-A470-2C7E974C4EF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{064D7281-3211-40E2-ABE1-B3F16160B027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{064D7281-3211-40E2-ABE1-B3F16160B027}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{064D7281-3211-40E2-ABE1-B3F16160B027}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{064D7281-3211-40E2-ABE1-B3F16160B027}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A18D00F9-DB54-4772-9DFD-580806F07AEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A18D00F9-DB54-4772-9DFD-580806F07AEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A18D00F9-DB54-4772-9DFD-580806F07AEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -363,10 +341,10 @@ Global
 		{C84980C7-A5FF-479E-838D-DB1D8F9F930C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C84980C7-A5FF-479E-838D-DB1D8F9F930C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C84980C7-A5FF-479E-838D-DB1D8F9F930C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{064D7281-3211-40E2-ABE1-B3F16160B027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{064D7281-3211-40E2-ABE1-B3F16160B027}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{064D7281-3211-40E2-ABE1-B3F16160B027}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{064D7281-3211-40E2-ABE1-B3F16160B027}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -375,62 +353,102 @@ Global
 		{C409E70E-77E2-46EE-BE71-0D6F7277FC06}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C409E70E-77E2-46EE-BE71-0D6F7277FC06}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C409E70E-77E2-46EE-BE71-0D6F7277FC06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1C4E375-6395-4D4C-9AC2-0611C78823E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CBBCEF4D-B2F4-497D-938F-76025EC0D142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CBBCEF4D-B2F4-497D-938F-76025EC0D142}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CBBCEF4D-B2F4-497D-938F-76025EC0D142}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CBBCEF4D-B2F4-497D-938F-76025EC0D142}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2C86C662-3611-4B50-8FC5-E54D7AEFD899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2C86C662-3611-4B50-8FC5-E54D7AEFD899}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2C86C662-3611-4B50-8FC5-E54D7AEFD899}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2C86C662-3611-4B50-8FC5-E54D7AEFD899}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CECED3B-385A-4C54-9E07-74E8341EB52D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2F9BC027-8D9A-4B9D-847F-388399FA7AB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2F9BC027-8D9A-4B9D-847F-388399FA7AB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2F9BC027-8D9A-4B9D-847F-388399FA7AB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2F9BC027-8D9A-4B9D-847F-388399FA7AB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0089C597-09A8-478B-9D0B-0B85C5A35A67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0089C597-09A8-478B-9D0B-0B85C5A35A67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0089C597-09A8-478B-9D0B-0B85C5A35A67}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0089C597-09A8-478B-9D0B-0B85C5A35A67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44AC224A-BB08-434A-9443-A1C98805B582}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44AC224A-BB08-434A-9443-A1C98805B582}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44AC224A-BB08-434A-9443-A1C98805B582}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44AC224A-BB08-434A-9443-A1C98805B582}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C114AFF6-377C-4694-B869-3B590317E87A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C114AFF6-377C-4694-B869-3B590317E87A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C114AFF6-377C-4694-B869-3B590317E87A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C114AFF6-377C-4694-B869-3B590317E87A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99E2010C-A3C7-4921-A15C-906C308857F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99E2010C-A3C7-4921-A15C-906C308857F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99E2010C-A3C7-4921-A15C-906C308857F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99E2010C-A3C7-4921-A15C-906C308857F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DE6834C-AFB3-461E-8920-CBF33CAD0490}.Release|Any CPU.Build.0 = Release|Any CPU
+		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FBBC1A7-3043-4707-A6BC-477A31D4307D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4146D2C3-BAAD-47FC-9571-2A18281942BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4146D2C3-BAAD-47FC-9571-2A18281942BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4146D2C3-BAAD-47FC-9571-2A18281942BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4146D2C3-BAAD-47FC-9571-2A18281942BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2DD40E6-3DDC-43EA-8231-9E2C0ADB9B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2DD40E6-3DDC-43EA-8231-9E2C0ADB9B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2DD40E6-3DDC-43EA-8231-9E2C0ADB9B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2DD40E6-3DDC-43EA-8231-9E2C0ADB9B77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05B23435-DB1A-45BC-BAB1-2FA1353A9A1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05B23435-DB1A-45BC-BAB1-2FA1353A9A1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05B23435-DB1A-45BC-BAB1-2FA1353A9A1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05B23435-DB1A-45BC-BAB1-2FA1353A9A1D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F841278B-AA28-4F9D-8483-754CA50F07FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F841278B-AA28-4F9D-8483-754CA50F07FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F841278B-AA28-4F9D-8483-754CA50F07FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F841278B-AA28-4F9D-8483-754CA50F07FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9E98C85-C184-4F96-A524-8C6080E7F8EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9E98C85-C184-4F96-A524-8C6080E7F8EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9E98C85-C184-4F96-A524-8C6080E7F8EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9E98C85-C184-4F96-A524-8C6080E7F8EB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F042EF08-55E7-45A3-A1D2-BE19E896BE9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -440,77 +458,80 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6D588F82-927E-488F-8417-DE538FF10B77} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{55B88031-3C95-499F-B2AF-CF531312F1FD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{0A7BF932-04A6-458B-8D6F-4F474F553BE6} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{116CF183-FD4A-4121-AEE9-1DF8C51BF858} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{70A40879-BA02-4860-9A55-D13DE8A456D8} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{8FBBC1A7-3043-4707-A6BC-477A31D4307D} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{99E2010C-A3C7-4921-A15C-906C308857F5} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{C114AFF6-377C-4694-B869-3B590317E87A} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{44AC224A-BB08-434A-9443-A1C98805B582} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{8E08B694-3806-492C-BCEC-7B74420E3041} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{A18D00F9-DB54-4772-9DFD-580806F07AEE} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{C84980C7-A5FF-479E-838D-DB1D8F9F930C} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{064D7281-3211-40E2-ABE1-B3F16160B027} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{C409E70E-77E2-46EE-BE71-0D6F7277FC06} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{D1C4E375-6395-4D4C-9AC2-0611C78823E3} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{CBBCEF4D-B2F4-497D-938F-76025EC0D142} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{2C86C662-3611-4B50-8FC5-E54D7AEFD899} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{2F9BC027-8D9A-4B9D-847F-388399FA7AB1} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{0089C597-09A8-478B-9D0B-0B85C5A35A67} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{4146D2C3-BAAD-47FC-9571-2A18281942BB} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{F841278B-AA28-4F9D-8483-754CA50F07FC} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{F042EF08-55E7-45A3-A1D2-BE19E896BE9F} = {BFC0CC54-6781-45CB-865F-72E9FABBD023}
-		{89A6E38E-1118-4FC6-957D-17751DAD8EAF} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{DDB95DB9-3E70-4F3E-B9D0-217A14215356} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{6120E7CF-3074-46C6-BDD1-1863784EAC69} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{A70A8EA7-24B3-42BF-83A6-94EB9B5C3C6C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{9026F7BB-2FB6-4B37-A4E7-32030FBA4B92} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{7E9B3AA8-5E87-4B19-9604-FE51C6548882} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{D7EC07C4-7679-4E97-B3A9-60D03607F758} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{C913A82A-3C17-4991-8F66-9D9F0B841E5E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{720A0CB6-828B-47EF-BC1C-0B98E52BBFCE} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{F9745791-BD7B-4337-BE8B-8AEEEB933E84} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{07A9935C-015D-43DD-9CDE-809301151F7C} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{67A6FA6A-F171-4A00-80ED-113736B2B5B5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{FB7C602E-3ED6-472A-85BD-420B61BA293D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{388F4768-2C2B-43F1-910A-E50F47130368} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{C573763D-C24C-4222-AAF0-66B0C2260EB4} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{78706510-4F89-4896-8E29-723C8F4B90AF} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{9CECED3B-385A-4C54-9E07-74E8341EB52D} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{2F2D5292-9A79-4654-A470-2C7E974C4EF0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{9DE6834C-AFB3-461E-8920-CBF33CAD0490} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
-		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5} = {76933DF1-12AA-4B5B-8863-EF38F10B1EC9}
+		{6D588F82-927E-488F-8417-DE538FF10B77} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{0A7BF932-04A6-458B-8D6F-4F474F553BE6} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{55B88031-3C95-499F-B2AF-CF531312F1FD} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{F5C79255-45C9-464F-A5A7-EB9678B3F9AD} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{B9D4CBED-3F96-4504-BA25-18CC9CBDDD9F} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{749A4A89-3CA2-49E1-B03C-3AB1A1C6FAFD} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{116CF183-FD4A-4121-AEE9-1DF8C51BF858} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{723957C4-C433-4B6D-BF0C-28AE36AEDDBD} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{D2632F0B-81B0-4E95-B2E7-599C6194B8CB} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{70A40879-BA02-4860-9A55-D13DE8A456D8} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{2D1CD2A4-2440-47AB-9C43-33C595ECE5F1} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{C6B1BE99-1AC3-4D2A-BD5B-74DBD8449C17} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{7EE41AEA-D25F-4A71-A5E3-8FEF863F794E} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{BCF8EC9B-1FED-4A44-9E64-A59015D9B141} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{8E08B694-3806-492C-BCEC-7B74420E3041} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{064D7281-3211-40E2-ABE1-B3F16160B027} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{A18D00F9-DB54-4772-9DFD-580806F07AEE} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{C84980C7-A5FF-479E-838D-DB1D8F9F930C} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{D1C4E375-6395-4D4C-9AC2-0611C78823E3} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{C409E70E-77E2-46EE-BE71-0D6F7277FC06} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{CBBCEF4D-B2F4-497D-938F-76025EC0D142} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{2C86C662-3611-4B50-8FC5-E54D7AEFD899} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{2F9BC027-8D9A-4B9D-847F-388399FA7AB1} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{6D95CEB5-A6AD-481F-9B7D-B8A7BA6B8529} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{0089C597-09A8-478B-9D0B-0B85C5A35A67} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{44AC224A-BB08-434A-9443-A1C98805B582} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{C114AFF6-377C-4694-B869-3B590317E87A} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{99E2010C-A3C7-4921-A15C-906C308857F5} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{8FBBC1A7-3043-4707-A6BC-477A31D4307D} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{4146D2C3-BAAD-47FC-9571-2A18281942BB} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{B2DD40E6-3DDC-43EA-8231-9E2C0ADB9B77} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{05B23435-DB1A-45BC-BAB1-2FA1353A9A1D} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{F841278B-AA28-4F9D-8483-754CA50F07FC} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{B7ACDBBE-C64B-482B-B80D-3DC002AD450B} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{CBC162FE-2E2F-4511-98AB-81E13E2DEE9C} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{C9E98C85-C184-4F96-A524-8C6080E7F8EB} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{F042EF08-55E7-45A3-A1D2-BE19E896BE9F} = {7CD93EC6-E968-4150-93E0-9DDD718795DE}
+		{89A6E38E-1118-4FC6-957D-17751DAD8EAF} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{36FAE390-EAAE-4193-98E7-34F10D3FA8E1} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{FCD95D0E-50AC-4FCF-AE52-8B38DB9B15C3} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{3636C4FF-4BBD-4BB8-B60B-E62F2C429EA4} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{B1AEB3DD-F8D6-48D1-8DB4-B232DA4103A0} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{6120E7CF-3074-46C6-BDD1-1863784EAC69} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{A70A8EA7-24B3-42BF-83A6-94EB9B5C3C6C} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{9026F7BB-2FB6-4B37-A4E7-32030FBA4B92} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{7E9B3AA8-5E87-4B19-9604-FE51C6548882} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{D7EC07C4-7679-4E97-B3A9-60D03607F758} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{720A0CB6-828B-47EF-BC1C-0B98E52BBFCE} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{F9745791-BD7B-4337-BE8B-8AEEEB933E84} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{C9B7388B-0963-49A3-AB52-3E3B724EE2A9} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{67A6FA6A-F171-4A00-80ED-113736B2B5B5} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{C913A82A-3C17-4991-8F66-9D9F0B841E5E} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{07A9935C-015D-43DD-9CDE-809301151F7C} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{FB7C602E-3ED6-472A-85BD-420B61BA293D} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{DDB95DB9-3E70-4F3E-B9D0-217A14215356} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{E5F61C36-FB9B-4DA7-96C0-056FBEADBB53} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{C573763D-C24C-4222-AAF0-66B0C2260EB4} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{388F4768-2C2B-43F1-910A-E50F47130368} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{B0D60DB8-2A4A-4B8B-83DF-A1C66BDD0982} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{90DFE463-DBD1-42F3-A33F-4D22E5C1DA4D} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{5DBF21B8-1E05-4774-A63D-E6C22CDFEA1A} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{E628527E-B7BD-4F3B-8045-EC7C887B1FC1} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{1D6514B4-3B0A-4E3F-BBA2-DB4BAD9502CA} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{78706510-4F89-4896-8E29-723C8F4B90AF} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{2F2D5292-9A79-4654-A470-2C7E974C4EF0} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{C50BBD27-2445-4DF4-9A1D-C7919D016BBC} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{BAE78100-3020-4AAE-BDBF-ACF9D1D1BA2F} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{9CECED3B-385A-4C54-9E07-74E8341EB52D} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{3BB5B390-66F6-4FCD-A7FE-1A9326A4D914} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{83D8F9FB-0A8D-4E48-A7CF-D169432A41AD} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{9DE6834C-AFB3-461E-8920-CBF33CAD0490} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{166F8860-E965-4E2D-A6C6-4CA44C9B5A1E} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{CC36DF9A-6602-47D9-B44B-C2D2C33A80D0} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
+		{2D8B86CE-7A3A-45F0-9127-AE6CDCEC6EA5} = {EA2BED3A-AB10-4481-A825-C24E3A934A9A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {81854B5B-5AA0-49DC-9B7B-9E2DB24D7507}
diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
index a9809bec457afd..3eb05411fe659d 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
@@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{DEB876AB-1AC4-48B9-9E7C-C014163BD155}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{0BC9E4F4-5C34-4B90-80AB-2933992D99A6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{34ECA788-A105-411B-AE8B-17B7CC1D703D}"
@@ -129,10 +131,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{FEC2349C-D18C-40B0-BA21-2111E383E972}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{6317DDE6-7597-4CC5-AA6C-548A531F15C6}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{B41AA17B-5129-41CC-8EA4-250B80BABF87}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{631AE96F-2615-4D38-B3BB-0D98777C4667}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{146EEF00-4AD0-4311-8077-124B5BD6225F}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{0813853E-8C78-429A-B01A-3FB2EF1898F8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766}"
@@ -141,11 +147,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54250557-8426-41F6-B3D9-1C6BAB986CEC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E041754F-1A93-443A-9294-87DC1C30B471}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B6AB8EA3-A276-4FD4-94E7-C7D22AE96B37}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{59A29BF0-B76B-41F8-A733-E2A0847AB992}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -153,14 +159,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -173,18 +179,22 @@ Global
 		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5532E155-E423-4FFD-B009-80B4281D36BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5532E155-E423-4FFD-B009-80B4281D36BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5532E155-E423-4FFD-B009-80B4281D36BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5532E155-E423-4FFD-B009-80B4281D36BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A738527-821F-4089-B64E-3C0F4714DC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A738527-821F-4089-B64E-3C0F4714DC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A738527-821F-4089-B64E-3C0F4714DC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A738527-821F-4089-B64E-3C0F4714DC78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{135F551E-ACB8-4073-ABB5-A1FA558455DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{135F551E-ACB8-4073-ABB5-A1FA558455DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{135F551E-ACB8-4073-ABB5-A1FA558455DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{135F551E-ACB8-4073-ABB5-A1FA558455DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D69326FC-CD05-4690-91C0-1537A80ACBFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D69326FC-CD05-4690-91C0-1537A80ACBFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D69326FC-CD05-4690-91C0-1537A80ACBFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -197,10 +207,10 @@ Global
 		{DD121F9F-3548-4247-8E10-FB584FC0827C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD121F9F-3548-4247-8E10-FB584FC0827C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD121F9F-3548-4247-8E10-FB584FC0827C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F25C0DB-E010-4802-8030-C88E2D09D3B0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{24220AD7-03ED-427A-BFC8-114C475EAD0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24220AD7-03ED-427A-BFC8-114C475EAD0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24220AD7-03ED-427A-BFC8-114C475EAD0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -209,14 +219,22 @@ Global
 		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{020874FC-11A2-4FC7-8929-527462F8819A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{020874FC-11A2-4FC7-8929-527462F8819A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{020874FC-11A2-4FC7-8929-527462F8819A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{020874FC-11A2-4FC7-8929-527462F8819A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{495208B7-31BB-4802-A769-CEE4917BDF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{495208B7-31BB-4802-A769-CEE4917BDF75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{495208B7-31BB-4802-A769-CEE4917BDF75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{495208B7-31BB-4802-A769-CEE4917BDF75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3411D565-223A-44B5-864C-E30F826001B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3411D565-223A-44B5-864C-E30F826001B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3411D565-223A-44B5-864C-E30F826001B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3411D565-223A-44B5-864C-E30F826001B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{020874FC-11A2-4FC7-8929-527462F8819A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{020874FC-11A2-4FC7-8929-527462F8819A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{020874FC-11A2-4FC7-8929-527462F8819A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{020874FC-11A2-4FC7-8929-527462F8819A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -229,30 +247,18 @@ Global
 		{6DB8DE55-5419-48EA-B4CD-2880E00409FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6DB8DE55-5419-48EA-B4CD-2880E00409FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6DB8DE55-5419-48EA-B4CD-2880E00409FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A738527-821F-4089-B64E-3C0F4714DC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A738527-821F-4089-B64E-3C0F4714DC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A738527-821F-4089-B64E-3C0F4714DC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A738527-821F-4089-B64E-3C0F4714DC78}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA9E6747-867B-4312-94B3-624EEB1C7A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA9E6747-867B-4312-94B3-624EEB1C7A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA9E6747-867B-4312-94B3-624EEB1C7A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA9E6747-867B-4312-94B3-624EEB1C7A7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCAE2699-A994-48FE-B9B0-5580D267BD2E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E3D564C-A79E-4E28-8E13-626EE7780831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E3D564C-A79E-4E28-8E13-626EE7780831}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E3D564C-A79E-4E28-8E13-626EE7780831}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -261,6 +267,14 @@ Global
 		{973CE6DA-B55D-4E55-88D5-53BE69D44410}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{973CE6DA-B55D-4E55-88D5-53BE69D44410}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{973CE6DA-B55D-4E55-88D5-53BE69D44410}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A021166-613C-430C-8460-50F1E0DF7AD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8845E6FF-94B2-4994-A8F4-DF30844A2168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8845E6FF-94B2-4994-A8F4-DF30844A2168}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8845E6FF-94B2-4994-A8F4-DF30844A2168}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -269,34 +283,26 @@ Global
 		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B729474D-0E96-4296-B317-450EE24F6B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B729474D-0E96-4296-B317-450EE24F6B48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B729474D-0E96-4296-B317-450EE24F6B48}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B729474D-0E96-4296-B317-450EE24F6B48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D466E363-F930-4D26-AE55-0256182961DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D466E363-F930-4D26-AE55-0256182961DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D466E363-F930-4D26-AE55-0256182961DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D466E363-F930-4D26-AE55-0256182961DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{495208B7-31BB-4802-A769-CEE4917BDF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{495208B7-31BB-4802-A769-CEE4917BDF75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{495208B7-31BB-4802-A769-CEE4917BDF75}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{495208B7-31BB-4802-A769-CEE4917BDF75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D466E363-F930-4D26-AE55-0256182961DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D466E363-F930-4D26-AE55-0256182961DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D466E363-F930-4D26-AE55-0256182961DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D466E363-F930-4D26-AE55-0256182961DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -313,58 +319,58 @@ Global
 		{47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4157F2E-F11D-48C6-A146-B4D12D9211F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4157F2E-F11D-48C6-A146-B4D12D9211F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4157F2E-F11D-48C6-A146-B4D12D9211F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4157F2E-F11D-48C6-A146-B4D12D9211F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{670AB88D-85C9-4674-A652-C27488ED73F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{670AB88D-85C9-4674-A652-C27488ED73F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{670AB88D-85C9-4674-A652-C27488ED73F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{670AB88D-85C9-4674-A652-C27488ED73F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4AB3E652-6709-4011-AC2F-C379A0415BAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4AB3E652-6709-4011-AC2F-C379A0415BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AB3E652-6709-4011-AC2F-C379A0415BAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AB3E652-6709-4011-AC2F-C379A0415BAC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D657A5A-C7DF-4817-864F-944755DCE6DF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0813853E-8C78-429A-B01A-3FB2EF1898F8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -373,18 +379,14 @@ Global
 		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28C9D427-83BA-46A6-BEF5-6994A07F2258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{28C9D427-83BA-46A6-BEF5-6994A07F2258}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28C9D427-83BA-46A6-BEF5-6994A07F2258}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28C9D427-83BA-46A6-BEF5-6994A07F2258}.Release|Any CPU.Build.0 = Release|Any CPU
-		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{465AE1C4-84DD-4864-916A-74D89DC3BBBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{465AE1C4-84DD-4864-916A-74D89DC3BBBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{465AE1C4-84DD-4864-916A-74D89DC3BBBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -393,14 +395,18 @@ Global
 		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{146EEF00-4AD0-4311-8077-124B5BD6225F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{146EEF00-4AD0-4311-8077-124B5BD6225F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{146EEF00-4AD0-4311-8077-124B5BD6225F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{146EEF00-4AD0-4311-8077-124B5BD6225F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{631AE96F-2615-4D38-B3BB-0D98777C4667}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{631AE96F-2615-4D38-B3BB-0D98777C4667}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{631AE96F-2615-4D38-B3BB-0D98777C4667}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -409,10 +415,14 @@ Global
 		{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEB876AB-1AC4-48B9-9E7C-C014163BD155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEB876AB-1AC4-48B9-9E7C-C014163BD155}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEB876AB-1AC4-48B9-9E7C-C014163BD155}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEB876AB-1AC4-48B9-9E7C-C014163BD155}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A5DD36AF-F0AD-4616-AB91-BC63E89B2744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A5DD36AF-F0AD-4616-AB91-BC63E89B2744}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5DD36AF-F0AD-4616-AB91-BC63E89B2744}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -421,6 +431,14 @@ Global
 		{34ECA788-A105-411B-AE8B-17B7CC1D703D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{34ECA788-A105-411B-AE8B-17B7CC1D703D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{34ECA788-A105-411B-AE8B-17B7CC1D703D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6317DDE6-7597-4CC5-AA6C-548A531F15C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6317DDE6-7597-4CC5-AA6C-548A531F15C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6317DDE6-7597-4CC5-AA6C-548A531F15C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6317DDE6-7597-4CC5-AA6C-548A531F15C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -442,77 +460,80 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{33C3D8F0-297F-4471-92B0-F4E8717F10E3} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{BCAE2699-A994-48FE-B9B0-5580D267BD2E} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{495208B7-31BB-4802-A769-CEE4917BDF75} = {06E9ED4F-D3CF-4216-A8C7-E8A0AB16E33D}
-		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{5532E155-E423-4FFD-B009-80B4281D36BA} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{135F551E-ACB8-4073-ABB5-A1FA558455DE} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{2F25C0DB-E010-4802-8030-C88E2D09D3B0} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{D69326FC-CD05-4690-91C0-1537A80ACBFF} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{42E1BF94-6FE0-4017-9702-55913BD95EDE} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{DD121F9F-3548-4247-8E10-FB584FC0827C} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{24220AD7-03ED-427A-BFC8-114C475EAD0F} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{45235656-E284-4682-BE70-9A284FD73243} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{47ACDB6F-34CB-478D-9E43-F3662EE5838D} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{E4157F2E-F11D-48C6-A146-B4D12D9211F7} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{670AB88D-85C9-4674-A652-C27488ED73F9} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{4AB3E652-6709-4011-AC2F-C379A0415BAC} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{3D657A5A-C7DF-4817-864F-944755DCE6DF} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{28C9D427-83BA-46A6-BEF5-6994A07F2258} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{465AE1C4-84DD-4864-916A-74D89DC3BBBC} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{34ECA788-A105-411B-AE8B-17B7CC1D703D} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{FEC2349C-D18C-40B0-BA21-2111E383E972} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F} = {E041754F-1A93-443A-9294-87DC1C30B471}
-		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{020874FC-11A2-4FC7-8929-527462F8819A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{3411D565-223A-44B5-864C-E30F826001B4} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0C041643-1217-466B-AF2E-1E44C7B117B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0A738527-821F-4089-B64E-3C0F4714DC78} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0A021166-613C-430C-8460-50F1E0DF7AD8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{1E3D564C-A79E-4E28-8E13-626EE7780831} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{973CE6DA-B55D-4E55-88D5-53BE69D44410} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{8845E6FF-94B2-4994-A8F4-DF30844A2168} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{B729474D-0E96-4296-B317-450EE24F6B48} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{D466E363-F930-4D26-AE55-0256182961DD} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0813853E-8C78-429A-B01A-3FB2EF1898F8} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{631AE96F-2615-4D38-B3BB-0D98777C4667} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{B41AA17B-5129-41CC-8EA4-250B80BABF87} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
-		{A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {59A29BF0-B76B-41F8-A733-E2A0847AB992}
+		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{5532E155-E423-4FFD-B009-80B4281D36BA} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{135F551E-ACB8-4073-ABB5-A1FA558455DE} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{D69326FC-CD05-4690-91C0-1537A80ACBFF} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{42E1BF94-6FE0-4017-9702-55913BD95EDE} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{DD121F9F-3548-4247-8E10-FB584FC0827C} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{2F25C0DB-E010-4802-8030-C88E2D09D3B0} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{24220AD7-03ED-427A-BFC8-114C475EAD0F} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{45235656-E284-4682-BE70-9A284FD73243} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{47ACDB6F-34CB-478D-9E43-F3662EE5838D} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{E4157F2E-F11D-48C6-A146-B4D12D9211F7} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{3D657A5A-C7DF-4817-864F-944755DCE6DF} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{670AB88D-85C9-4674-A652-C27488ED73F9} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{4AB3E652-6709-4011-AC2F-C379A0415BAC} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{28C9D427-83BA-46A6-BEF5-6994A07F2258} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{465AE1C4-84DD-4864-916A-74D89DC3BBBC} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{146EEF00-4AD0-4311-8077-124B5BD6225F} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{DEB876AB-1AC4-48B9-9E7C-C014163BD155} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{34ECA788-A105-411B-AE8B-17B7CC1D703D} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{6317DDE6-7597-4CC5-AA6C-548A531F15C6} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{6F69FD88-7BD1-41DF-BF5D-F0E5F12BE766} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{FEC2349C-D18C-40B0-BA21-2111E383E972} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F} = {54250557-8426-41F6-B3D9-1C6BAB986CEC}
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3} = {B6AB8EA3-A276-4FD4-94E7-C7D22AE96B37}
+		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F} = {B6AB8EA3-A276-4FD4-94E7-C7D22AE96B37}
+		{BCAE2699-A994-48FE-B9B0-5580D267BD2E} = {B6AB8EA3-A276-4FD4-94E7-C7D22AE96B37}
+		{495208B7-31BB-4802-A769-CEE4917BDF75} = {B6AB8EA3-A276-4FD4-94E7-C7D22AE96B37}
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0A738527-821F-4089-B64E-3C0F4714DC78} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{3411D565-223A-44B5-864C-E30F826001B4} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{020874FC-11A2-4FC7-8929-527462F8819A} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0C041643-1217-466B-AF2E-1E44C7B117B1} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{1E3D564C-A79E-4E28-8E13-626EE7780831} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{973CE6DA-B55D-4E55-88D5-53BE69D44410} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0A021166-613C-430C-8460-50F1E0DF7AD8} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{8845E6FF-94B2-4994-A8F4-DF30844A2168} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{B729474D-0E96-4296-B317-450EE24F6B48} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{D466E363-F930-4D26-AE55-0256182961DD} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{FBF0B5C9-CD20-4B8A-83B4-6281A2EEBC45} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{631AE96F-2615-4D38-B3BB-0D98777C4667} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{B41AA17B-5129-41CC-8EA4-250B80BABF87} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{A5DD36AF-F0AD-4616-AB91-BC63E89B2744} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
+		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA} = {E7FDBC00-D4D2-4751-BA56-D1F960BF8B2B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {971198CC-ACB9-4718-9024-42A87E02E503}
diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
index bbb76ebd7a1ab7..fc2c3f33f7ae40 100644
--- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
+++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
@@ -37,17 +37,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{68B501BC-5281-4BC8-B631-C34013E4505E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{2E592A51-180A-40A1-BAFF-7B17BB7A56BD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{44EE40EE-2AD9-45D9-A939-A893FA76390C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACFC297E-FE60-47EE-99A0-501E795FF4D6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F404DDF2-F9F5-42B2-A774-D03289C7DC55}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AC22531E-0F15-4324-9241-2BD562CB7C6B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{85CA7F89-243A-4516-B577-78E6CDAB789B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{96EA71C4-C73B-4C6C-AA06-05635B20A2DC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -67,22 +69,10 @@ Global
 		{1236A517-6B61-4A62-9495-1C945EDA4D12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1236A517-6B61-4A62-9495-1C945EDA4D12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1236A517-6B61-4A62-9495-1C945EDA4D12}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40143A60-7177-4173-90D4-2891584748CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40143A60-7177-4173-90D4-2891584748CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40143A60-7177-4173-90D4-2891584748CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{40143A60-7177-4173-90D4-2891584748CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B792E72A-0513-4359-B754-D0372610DDCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B792E72A-0513-4359-B754-D0372610DDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B792E72A-0513-4359-B754-D0372610DDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B792E72A-0513-4359-B754-D0372610DDCE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85615392-9242-4CAF-A0FE-A439FF615462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{85615392-9242-4CAF-A0FE-A439FF615462}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85615392-9242-4CAF-A0FE-A439FF615462}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,6 +81,18 @@ Global
 		{BECC7A6E-1438-4EAC-B34B-276DEF463769}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BECC7A6E-1438-4EAC-B34B-276DEF463769}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BECC7A6E-1438-4EAC-B34B-276DEF463769}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35FEC7D0-BA1A-49B3-B183-309CC182E60B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE515C8F-654E-4434-8F3F-014ECD86369D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B792E72A-0513-4359-B754-D0372610DDCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B792E72A-0513-4359-B754-D0372610DDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B792E72A-0513-4359-B754-D0372610DDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B792E72A-0513-4359-B754-D0372610DDCE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,6 +109,10 @@ Global
 		{A12B92C6-071A-4C61-8934-371DBB240873}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A12B92C6-071A-4C61-8934-371DBB240873}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A12B92C6-071A-4C61-8934-371DBB240873}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE012146-4D34-44CC-8701-53C42F2943D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE012146-4D34-44CC-8701-53C42F2943D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE012146-4D34-44CC-8701-53C42F2943D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE012146-4D34-44CC-8701-53C42F2943D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7110AF00-8902-4693-8697-64B89F6ADFEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7110AF00-8902-4693-8697-64B89F6ADFEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7110AF00-8902-4693-8697-64B89F6ADFEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -115,22 +121,14 @@ Global
 		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE012146-4D34-44CC-8701-53C42F2943D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE012146-4D34-44CC-8701-53C42F2943D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE012146-4D34-44CC-8701-53C42F2943D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE012146-4D34-44CC-8701-53C42F2943D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8E552A7E-0C8C-49C2-8988-19469A732E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8E552A7E-0C8C-49C2-8988-19469A732E26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E552A7E-0C8C-49C2-8988-19469A732E26}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E552A7E-0C8C-49C2-8988-19469A732E26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -139,37 +137,46 @@ Global
 		{68B501BC-5281-4BC8-B631-C34013E4505E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{68B501BC-5281-4BC8-B631-C34013E4505E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{68B501BC-5281-4BC8-B631-C34013E4505E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25}.Release|Any CPU.Build.0 = Release|Any CPU
 		{44EE40EE-2AD9-45D9-A939-A893FA76390C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{44EE40EE-2AD9-45D9-A939-A893FA76390C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{44EE40EE-2AD9-45D9-A939-A893FA76390C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{44EE40EE-2AD9-45D9-A939-A893FA76390C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E592A51-180A-40A1-BAFF-7B17BB7A56BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E592A51-180A-40A1-BAFF-7B17BB7A56BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E592A51-180A-40A1-BAFF-7B17BB7A56BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E592A51-180A-40A1-BAFF-7B17BB7A56BD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D4D155B6-2A90-4ECD-97F9-A288F7979375} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{40143A60-7177-4173-90D4-2891584748CA} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{35FEC7D0-BA1A-49B3-B183-309CC182E60B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{85615392-9242-4CAF-A0FE-A439FF615462} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{BECC7A6E-1438-4EAC-B34B-276DEF463769} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{7110AF00-8902-4693-8697-64B89F6ADFEB} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{DE012146-4D34-44CC-8701-53C42F2943D2} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{44EE40EE-2AD9-45D9-A939-A893FA76390C} = {ACFC297E-FE60-47EE-99A0-501E795FF4D6}
-		{58A1E42E-5DA1-452A-B39C-A1819171970A} = {AC22531E-0F15-4324-9241-2BD562CB7C6B}
-		{DE515C8F-654E-4434-8F3F-014ECD86369D} = {AC22531E-0F15-4324-9241-2BD562CB7C6B}
-		{1236A517-6B61-4A62-9495-1C945EDA4D12} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{B792E72A-0513-4359-B754-D0372610DDCE} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{65079F8F-0653-4474-B105-551A9B6F102B} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{A12B92C6-071A-4C61-8934-371DBB240873} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{8E552A7E-0C8C-49C2-8988-19469A732E26} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
-		{68B501BC-5281-4BC8-B631-C34013E4505E} = {96EA71C4-C73B-4C6C-AA06-05635B20A2DC}
+		{D4D155B6-2A90-4ECD-97F9-A288F7979375} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{40143A60-7177-4173-90D4-2891584748CA} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{85615392-9242-4CAF-A0FE-A439FF615462} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{BECC7A6E-1438-4EAC-B34B-276DEF463769} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{35FEC7D0-BA1A-49B3-B183-309CC182E60B} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{DE012146-4D34-44CC-8701-53C42F2943D2} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{7110AF00-8902-4693-8697-64B89F6ADFEB} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{44EE40EE-2AD9-45D9-A939-A893FA76390C} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{2E592A51-180A-40A1-BAFF-7B17BB7A56BD} = {F404DDF2-F9F5-42B2-A774-D03289C7DC55}
+		{58A1E42E-5DA1-452A-B39C-A1819171970A} = {85CA7F89-243A-4516-B577-78E6CDAB789B}
+		{DE515C8F-654E-4434-8F3F-014ECD86369D} = {85CA7F89-243A-4516-B577-78E6CDAB789B}
+		{1236A517-6B61-4A62-9495-1C945EDA4D12} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{B792E72A-0513-4359-B754-D0372610DDCE} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{65079F8F-0653-4474-B105-551A9B6F102B} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{A12B92C6-071A-4C61-8934-371DBB240873} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{8E552A7E-0C8C-49C2-8988-19469A732E26} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{68B501BC-5281-4BC8-B631-C34013E4505E} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
+		{3DD4EF0E-36D5-48BD-8F8A-1D7DAF74EC25} = {A4A4B9AA-0359-48AE-B760-555E0CA0FAD2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {02FCA09C-178B-4DE0-98E0-BCCDEBA97903}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln b/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln
index 970154049e48ad..83e497dc06b499 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/Microsoft.Extensions.Logging.Configuration.sln
@@ -49,15 +49,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{531F1DAF-B4DE-4240-B7BE-E206330E3792}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{B6115158-B1EA-431E-B436-F4680FA2E5AB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{B077F55F-E15A-4B91-A1EB-8178B8313908}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3CFBDC1C-B621-4921-9AEF-3891B2B644C5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{907BD280-43B8-41A1-A306-8B903993DCE4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B592E91-F7DB-4B78-A1CE-CB1CA436220E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{491C86E8-F962-4B10-8BD1-BAE5590185F0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F73D2E3-42B1-4786-B353-33D016BD0553}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -73,18 +75,14 @@ Global
 		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91D63569-CA51-4362-B4FC-9BD66302373F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91D63569-CA51-4362-B4FC-9BD66302373F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91D63569-CA51-4362-B4FC-9BD66302373F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91D63569-CA51-4362-B4FC-9BD66302373F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D482622B-7B40-4311-977F-11C09B98BA4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D482622B-7B40-4311-977F-11C09B98BA4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D482622B-7B40-4311-977F-11C09B98BA4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D482622B-7B40-4311-977F-11C09B98BA4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D9979978-4230-427D-88F6-455F1D59FE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D9979978-4230-427D-88F6-455F1D59FE96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D9979978-4230-427D-88F6-455F1D59FE96}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,26 +91,26 @@ Global
 		{1717DDEF-8917-4382-B5DC-073B2F2F4361}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1717DDEF-8917-4382-B5DC-073B2F2F4361}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1717DDEF-8917-4382-B5DC-073B2F2F4361}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91D63569-CA51-4362-B4FC-9BD66302373F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91D63569-CA51-4362-B4FC-9BD66302373F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91D63569-CA51-4362-B4FC-9BD66302373F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91D63569-CA51-4362-B4FC-9BD66302373F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{36176FF1-8C33-494D-A496-1D7E0DCFCD86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{36176FF1-8C33-494D-A496-1D7E0DCFCD86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{36176FF1-8C33-494D-A496-1D7E0DCFCD86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{36176FF1-8C33-494D-A496-1D7E0DCFCD86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71755B81-EF5C-4C36-A278-60D69ECCC158}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4467B594-D9A5-432C-A1CC-07F9C9CED010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4467B594-D9A5-432C-A1CC-07F9C9CED010}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4467B594-D9A5-432C-A1CC-07F9C9CED010}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4467B594-D9A5-432C-A1CC-07F9C9CED010}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BBCC241D-0980-4735-8187-229D37ADC0E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BBCC241D-0980-4735-8187-229D37ADC0E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBCC241D-0980-4735-8187-229D37ADC0E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,58 +119,66 @@ Global
 		{E7035B72-0180-437E-A696-1F0CD8921279}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E7035B72-0180-437E-A696-1F0CD8921279}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E7035B72-0180-437E-A696-1F0CD8921279}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93C7964F-6A2F-48C7-A3EA-322401532E8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5645B3B9-A523-4C61-8417-4EE0C90380AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5645B3B9-A523-4C61-8417-4EE0C90380AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5645B3B9-A523-4C61-8417-4EE0C90380AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5645B3B9-A523-4C61-8417-4EE0C90380AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02F90254-A566-440D-9B98-A31A8A1A4D5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5C771533-F8F4-47A0-9E3C-614F87A72744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5C771533-F8F4-47A0-9E3C-614F87A72744}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C771533-F8F4-47A0-9E3C-614F87A72744}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C771533-F8F4-47A0-9E3C-614F87A72744}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}.Release|Any CPU.Build.0 = Release|Any CPU
 		{531F1DAF-B4DE-4240-B7BE-E206330E3792}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{531F1DAF-B4DE-4240-B7BE-E206330E3792}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{531F1DAF-B4DE-4240-B7BE-E206330E3792}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{531F1DAF-B4DE-4240-B7BE-E206330E3792}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD09F265-2818-40E4-8732-C41DE48A4EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD09F265-2818-40E4-8732-C41DE48A4EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD09F265-2818-40E4-8732-C41DE48A4EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CD09F265-2818-40E4-8732-C41DE48A4EF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{788150B7-B822-4466-A1DC-C875449DE449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{788150B7-B822-4466-A1DC-C875449DE449}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{788150B7-B822-4466-A1DC-C875449DE449}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{788150B7-B822-4466-A1DC-C875449DE449}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20D72006-BAEF-4604-A9DC-2864FED9DF9A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B077F55F-E15A-4B91-A1EB-8178B8313908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B077F55F-E15A-4B91-A1EB-8178B8313908}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B077F55F-E15A-4B91-A1EB-8178B8313908}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B077F55F-E15A-4B91-A1EB-8178B8313908}.Release|Any CPU.Build.0 = Release|Any CPU
+		{788150B7-B822-4466-A1DC-C875449DE449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{788150B7-B822-4466-A1DC-C875449DE449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{788150B7-B822-4466-A1DC-C875449DE449}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{788150B7-B822-4466-A1DC-C875449DE449}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D6D8484-D8D0-4FCA-B6FA-B665C629D78F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D6D8484-D8D0-4FCA-B6FA-B665C629D78F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D6D8484-D8D0-4FCA-B6FA-B665C629D78F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6D6D8484-D8D0-4FCA-B6FA-B665C629D78F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Release|Any CPU.Build.0 = Release|Any CPU
 		{907BD280-43B8-41A1-A306-8B903993DCE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{907BD280-43B8-41A1-A306-8B903993DCE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{907BD280-43B8-41A1-A306-8B903993DCE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{907BD280-43B8-41A1-A306-8B903993DCE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6115158-B1EA-431E-B436-F4680FA2E5AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6115158-B1EA-431E-B436-F4680FA2E5AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6115158-B1EA-431E-B436-F4680FA2E5AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6115158-B1EA-431E-B436-F4680FA2E5AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -182,34 +188,35 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{91D63569-CA51-4362-B4FC-9BD66302373F} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{D482622B-7B40-4311-977F-11C09B98BA4F} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{D9979978-4230-427D-88F6-455F1D59FE96} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{5645B3B9-A523-4C61-8417-4EE0C90380AB} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{02F90254-A566-440D-9B98-A31A8A1A4D5B} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{5C771533-F8F4-47A0-9E3C-614F87A72744} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{20D72006-BAEF-4604-A9DC-2864FED9DF9A} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5} = {3B592E91-F7DB-4B78-A1CE-CB1CA436220E}
-		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{1717DDEF-8917-4382-B5DC-073B2F2F4361} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{71755B81-EF5C-4C36-A278-60D69ECCC158} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{36176FF1-8C33-494D-A496-1D7E0DCFCD86} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{4467B594-D9A5-432C-A1CC-07F9C9CED010} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{93C7964F-6A2F-48C7-A3EA-322401532E8C} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{BBCC241D-0980-4735-8187-229D37ADC0E5} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{E7035B72-0180-437E-A696-1F0CD8921279} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{531F1DAF-B4DE-4240-B7BE-E206330E3792} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{CD09F265-2818-40E4-8732-C41DE48A4EF7} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{788150B7-B822-4466-A1DC-C875449DE449} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{B077F55F-E15A-4B91-A1EB-8178B8313908} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{6D6D8484-D8D0-4FCA-B6FA-B665C629D78F} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
-		{907BD280-43B8-41A1-A306-8B903993DCE4} = {ED0ADAC4-705C-421A-A8D2-69CFFFCF734B}
+		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{D482622B-7B40-4311-977F-11C09B98BA4F} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{D9979978-4230-427D-88F6-455F1D59FE96} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{91D63569-CA51-4362-B4FC-9BD66302373F} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{02F90254-A566-440D-9B98-A31A8A1A4D5B} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{5645B3B9-A523-4C61-8417-4EE0C90380AB} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{5C771533-F8F4-47A0-9E3C-614F87A72744} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{20D72006-BAEF-4604-A9DC-2864FED9DF9A} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{B6115158-B1EA-431E-B436-F4680FA2E5AB} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5} = {491C86E8-F962-4B10-8BD1-BAE5590185F0}
+		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{1717DDEF-8917-4382-B5DC-073B2F2F4361} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{36176FF1-8C33-494D-A496-1D7E0DCFCD86} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{71755B81-EF5C-4C36-A278-60D69ECCC158} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{4467B594-D9A5-432C-A1CC-07F9C9CED010} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{BBCC241D-0980-4735-8187-229D37ADC0E5} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{E7035B72-0180-437E-A696-1F0CD8921279} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{93C7964F-6A2F-48C7-A3EA-322401532E8C} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{531F1DAF-B4DE-4240-B7BE-E206330E3792} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{CD09F265-2818-40E4-8732-C41DE48A4EF7} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{B077F55F-E15A-4B91-A1EB-8178B8313908} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{788150B7-B822-4466-A1DC-C875449DE449} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{6D6D8484-D8D0-4FCA-B6FA-B665C629D78F} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
+		{907BD280-43B8-41A1-A306-8B903993DCE4} = {2F73D2E3-42B1-4786-B353-33D016BD0553}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E5154479-615B-4978-AE5A-A7DE55907E36}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
index 992cbc4d3929ef..0687132ae130b8 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Console/Microsoft.Extensions.Logging.Console.sln
@@ -57,23 +57,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{E533CDDC-F53C-4F6C-89BF-EE4D175FC6DC}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0FB1C55D-62A0-4537-93F8-294761B37CFB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{EB05EC17-2C21-47EC-A39D-90ABBA053318}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{5B0AE436-FC09-44FD-8340-2A9969D5B7D9}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{AD117F41-062A-4158-A17D-3375820A53FA}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{E565D502-5B2F-4712-8286-F58A4874324D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB19DE2B-6A14-4CDA-94EF-845BAF293051}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BE43F35B-BEE1-42B2-805B-279876C42154}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A7BC3DE4-5E79-4552-8E42-D1D13B7293CB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BC17DFD9-48D9-42AE-B47E-B20F70588E41}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -97,50 +103,54 @@ Global
 		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E565D502-5B2F-4712-8286-F58A4874324D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E565D502-5B2F-4712-8286-F58A4874324D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E565D502-5B2F-4712-8286-F58A4874324D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E565D502-5B2F-4712-8286-F58A4874324D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AC6EFD37-CF1C-4893-B2BA-41826794F711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC6EFD37-CF1C-4893-B2BA-41826794F711}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AC6EFD37-CF1C-4893-B2BA-41826794F711}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC6EFD37-CF1C-4893-B2BA-41826794F711}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A02D298-6899-4DD0-BFF4-40702BC30BCD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{27525A8A-61B3-4FDB-B096-36E977A6BE0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{27525A8A-61B3-4FDB-B096-36E977A6BE0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{27525A8A-61B3-4FDB-B096-36E977A6BE0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{27525A8A-61B3-4FDB-B096-36E977A6BE0F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E09FB553-28C4-4C1C-8E86-CFAB3374A656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E09FB553-28C4-4C1C-8E86-CFAB3374A656}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E09FB553-28C4-4C1C-8E86-CFAB3374A656}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E09FB553-28C4-4C1C-8E86-CFAB3374A656}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6316940A-1032-4A41-8D2E-4A9E08B612F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B60701F7-43B3-4A85-B808-5FF9C1865898}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B0AE436-FC09-44FD-8340-2A9969D5B7D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B0AE436-FC09-44FD-8340-2A9969D5B7D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B0AE436-FC09-44FD-8340-2A9969D5B7D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B0AE436-FC09-44FD-8340-2A9969D5B7D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{60720C98-E619-40A6-9536-BC47AD0A056A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{60720C98-E619-40A6-9536-BC47AD0A056A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{60720C98-E619-40A6-9536-BC47AD0A056A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -149,38 +159,34 @@ Global
 		{D1A26695-26BD-45CE-BB18-F5CC75801992}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D1A26695-26BD-45CE-BB18-F5CC75801992}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1A26695-26BD-45CE-BB18-F5CC75801992}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D902BAF8-7431-4017-BD56-F4EABE38D7F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D902BAF8-7431-4017-BD56-F4EABE38D7F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D902BAF8-7431-4017-BD56-F4EABE38D7F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D902BAF8-7431-4017-BD56-F4EABE38D7F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EF05AB17-527F-40BC-B4D1-AAE510267F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EF05AB17-527F-40BC-B4D1-AAE510267F4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EF05AB17-527F-40BC-B4D1-AAE510267F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EF05AB17-527F-40BC-B4D1-AAE510267F4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ED51A791-65BB-4F8B-B76C-769D0663D4A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ED51A791-65BB-4F8B-B76C-769D0663D4A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ED51A791-65BB-4F8B-B76C-769D0663D4A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ED51A791-65BB-4F8B-B76C-769D0663D4A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -189,6 +195,10 @@ Global
 		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AD117F41-062A-4158-A17D-3375820A53FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD117F41-062A-4158-A17D-3375820A53FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD117F41-062A-4158-A17D-3375820A53FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -197,18 +207,18 @@ Global
 		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB05EC17-2C21-47EC-A39D-90ABBA053318}.Release|Any CPU.Build.0 = Release|Any CPU
 		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E533CDDC-F53C-4F6C-89BF-EE4D175FC6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E533CDDC-F53C-4F6C-89BF-EE4D175FC6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E533CDDC-F53C-4F6C-89BF-EE4D175FC6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E533CDDC-F53C-4F6C-89BF-EE4D175FC6DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2299110F-60C7-4812-A15B-B74A14FFBFA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2299110F-60C7-4812-A15B-B74A14FFBFA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2299110F-60C7-4812-A15B-B74A14FFBFA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -221,46 +231,57 @@ Global
 		{8AA8114D-BC87-45E3-8C6D-1618C48D5741}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AA8114D-BC87-45E3-8C6D-1618C48D5741}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AA8114D-BC87-45E3-8C6D-1618C48D5741}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FB1C55D-62A0-4537-93F8-294761B37CFB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{87E4E376-68A8-4867-9E83-CBD16D8B99B7} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{AC6EFD37-CF1C-4893-B2BA-41826794F711} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{60720C98-E619-40A6-9536-BC47AD0A056A} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{D1A26695-26BD-45CE-BB18-F5CC75801992} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{0FB1C55D-62A0-4537-93F8-294761B37CFB} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{2299110F-60C7-4812-A15B-B74A14FFBFA7} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{8AA8114D-BC87-45E3-8C6D-1618C48D5741} = {AB19DE2B-6A14-4CDA-94EF-845BAF293051}
-		{6A1C4B05-982A-4BD9-957F-E77992C54EBA} = {A7BC3DE4-5E79-4552-8E42-D1D13B7293CB}
-		{B60701F7-43B3-4A85-B808-5FF9C1865898} = {A7BC3DE4-5E79-4552-8E42-D1D13B7293CB}
-		{974792E2-0311-446A-BABF-18B3A8DDDEC5} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{6A02D298-6899-4DD0-BFF4-40702BC30BCD} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{27525A8A-61B3-4FDB-B096-36E977A6BE0F} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{6316940A-1032-4A41-8D2E-4A9E08B612F6} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{E09FB553-28C4-4C1C-8E86-CFAB3374A656} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{D902BAF8-7431-4017-BD56-F4EABE38D7F9} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{EB05EC17-2C21-47EC-A39D-90ABBA053318} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{EF05AB17-527F-40BC-B4D1-AAE510267F4E} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{ED51A791-65BB-4F8B-B76C-769D0663D4A7} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{AD117F41-062A-4158-A17D-3375820A53FA} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
-		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429} = {F3BAE0A3-1AF5-4F38-ADBE-6FEC99664322}
+		{87E4E376-68A8-4867-9E83-CBD16D8B99B7} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{E565D502-5B2F-4712-8286-F58A4874324D} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{AC6EFD37-CF1C-4893-B2BA-41826794F711} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{5B0AE436-FC09-44FD-8340-2A9969D5B7D9} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{60720C98-E619-40A6-9536-BC47AD0A056A} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{D1A26695-26BD-45CE-BB18-F5CC75801992} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{E533CDDC-F53C-4F6C-89BF-EE4D175FC6DC} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{2299110F-60C7-4812-A15B-B74A14FFBFA7} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{8AA8114D-BC87-45E3-8C6D-1618C48D5741} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{0FB1C55D-62A0-4537-93F8-294761B37CFB} = {BE43F35B-BEE1-42B2-805B-279876C42154}
+		{6A1C4B05-982A-4BD9-957F-E77992C54EBA} = {BC17DFD9-48D9-42AE-B47E-B20F70588E41}
+		{B60701F7-43B3-4A85-B808-5FF9C1865898} = {BC17DFD9-48D9-42AE-B47E-B20F70588E41}
+		{974792E2-0311-446A-BABF-18B3A8DDDEC5} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{6A02D298-6899-4DD0-BFF4-40702BC30BCD} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{27525A8A-61B3-4FDB-B096-36E977A6BE0F} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{E09FB553-28C4-4C1C-8E86-CFAB3374A656} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{6316940A-1032-4A41-8D2E-4A9E08B612F6} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{D902BAF8-7431-4017-BD56-F4EABE38D7F9} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{EF05AB17-527F-40BC-B4D1-AAE510267F4E} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{ED51A791-65BB-4F8B-B76C-769D0663D4A7} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{AD117F41-062A-4158-A17D-3375820A53FA} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
+		{EB05EC17-2C21-47EC-A39D-90ABBA053318} = {DEA4FD4A-56F2-40CB-B5CB-6A16D85EEF38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1591684-381C-4761-A20A-4B7FA24E5557}
diff --git a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
index 255b413c6450bc..daca161f3859d3 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Debug/Microsoft.Extensions.Logging.Debug.sln
@@ -33,15 +33,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{92161540-217B-4691-8949-9FA4BC995FF3}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C839B756-1681-4DFD-A73E-9EFB91C3495D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{668A1DC6-089D-4ABA-A32B-E1F85EAD1790}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33C65345-4AE9-41DF-8CC8-5C81979DBD03}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B5160031-23B4-4612-9754-70C805C440CB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2DD45424-4072-43BE-A977-85277CA06254}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,54 +59,54 @@ Global
 		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7B89700F-897A-4CE8-B789-C9F915631845}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7B89700F-897A-4CE8-B789-C9F915631845}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7B89700F-897A-4CE8-B789-C9F915631845}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7B89700F-897A-4CE8-B789-C9F915631845}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7DC15EBB-2614-473D-9B46-D764F8E1613C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DC15EBB-2614-473D-9B46-D764F8E1613C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DC15EBB-2614-473D-9B46-D764F8E1613C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7DC15EBB-2614-473D-9B46-D764F8E1613C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16E075F3-372C-4A98-BDAF-FF615B8A9855}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{850FBE78-DE29-480D-B4EE-6D260B0341B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{850FBE78-DE29-480D-B4EE-6D260B0341B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{850FBE78-DE29-480D-B4EE-6D260B0341B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{850FBE78-DE29-480D-B4EE-6D260B0341B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{544BBE63-3650-42E0-AD83-B613907BE753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{544BBE63-3650-42E0-AD83-B613907BE753}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{544BBE63-3650-42E0-AD83-B613907BE753}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{544BBE63-3650-42E0-AD83-B613907BE753}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{544BBE63-3650-42E0-AD83-B613907BE753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{544BBE63-3650-42E0-AD83-B613907BE753}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{544BBE63-3650-42E0-AD83-B613907BE753}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{544BBE63-3650-42E0-AD83-B613907BE753}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B39EB467-7C81-482C-A1EA-D6B183E43DE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B39EB467-7C81-482C-A1EA-D6B183E43DE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B39EB467-7C81-482C-A1EA-D6B183E43DE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B39EB467-7C81-482C-A1EA-D6B183E43DE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FB47333-590F-417A-832D-83CD81BAA4E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB19DE2F-5A32-4769-8CB5-80E59C500229}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BB19DE2F-5A32-4769-8CB5-80E59C500229}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB19DE2F-5A32-4769-8CB5-80E59C500229}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -125,6 +127,10 @@ Global
 		{AD197619-E574-41FD-A70F-FDE7C750E6DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD197619-E574-41FD-A70F-FDE7C750E6DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD197619-E574-41FD-A70F-FDE7C750E6DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92161540-217B-4691-8949-9FA4BC995FF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92161540-217B-4691-8949-9FA4BC995FF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92161540-217B-4691-8949-9FA4BC995FF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92161540-217B-4691-8949-9FA4BC995FF3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C839B756-1681-4DFD-A73E-9EFB91C3495D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C839B756-1681-4DFD-A73E-9EFB91C3495D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C839B756-1681-4DFD-A73E-9EFB91C3495D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -134,26 +140,27 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7EAFD932-A183-488B-8688-531568CEE5B2} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{16E075F3-372C-4A98-BDAF-FF615B8A9855} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{7DC15EBB-2614-473D-9B46-D764F8E1613C} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{B39EB467-7C81-482C-A1EA-D6B183E43DE9} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{BB19DE2F-5A32-4769-8CB5-80E59C500229} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{E3D3AF4B-1494-4272-8B7F-23385704E49A} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{AD197619-E574-41FD-A70F-FDE7C750E6DF} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{C839B756-1681-4DFD-A73E-9EFB91C3495D} = {33C65345-4AE9-41DF-8CC8-5C81979DBD03}
-		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{7B89700F-897A-4CE8-B789-C9F915631845} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{850FBE78-DE29-480D-B4EE-6D260B0341B4} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{544BBE63-3650-42E0-AD83-B613907BE753} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{3FB47333-590F-417A-832D-83CD81BAA4E1} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
-		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F} = {FC2F4F53-DFE7-4A0B-A85C-D266FDD51526}
+		{7EAFD932-A183-488B-8688-531568CEE5B2} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{7DC15EBB-2614-473D-9B46-D764F8E1613C} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{16E075F3-372C-4A98-BDAF-FF615B8A9855} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{B39EB467-7C81-482C-A1EA-D6B183E43DE9} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{BB19DE2F-5A32-4769-8CB5-80E59C500229} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{E3D3AF4B-1494-4272-8B7F-23385704E49A} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{AD197619-E574-41FD-A70F-FDE7C750E6DF} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{92161540-217B-4691-8949-9FA4BC995FF3} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{C839B756-1681-4DFD-A73E-9EFB91C3495D} = {B5160031-23B4-4612-9754-70C805C440CB}
+		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{7B89700F-897A-4CE8-B789-C9F915631845} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{850FBE78-DE29-480D-B4EE-6D260B0341B4} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{544BBE63-3650-42E0-AD83-B613907BE753} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{3FB47333-590F-417A-832D-83CD81BAA4E1} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790} = {2DD45424-4072-43BE-A977-85277CA06254}
+		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F} = {2DD45424-4072-43BE-A977-85277CA06254}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4842DEC4-687D-48D9-B1FE-FF5456C0B60B}
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
index f902c80971692d..ef8297a1e13f3b 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.EventLog/Microsoft.Extensions.Logging.EventLog.sln
@@ -33,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{1D99D47C-7A6B-4635-905B-891B3D5AF79B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{1B6F17F1-1501-4C06-82D7-7BE1A3688B9A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{3D501DAC-12C1-4423-AE63-7157624B65DB}"
@@ -55,9 +57,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7B420EF-E739-4C94-A0D3-5F08E123F2BC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2B44B3A8-313C-4037-B6CD-0BE958DF2133}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,18 +67,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EA9057E-5887-4BDB-8785-A752D96D89F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EA9057E-5887-4BDB-8785-A752D96D89F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EA9057E-5887-4BDB-8785-A752D96D89F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EA9057E-5887-4BDB-8785-A752D96D89F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{738E67B2-2339-4A33-AE35-27D426CFF6DC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -85,26 +83,30 @@ Global
 		{D41F65C3-1D86-44FA-BE07-9E95392E2519}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D41F65C3-1D86-44FA-BE07-9E95392E2519}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D41F65C3-1D86-44FA-BE07-9E95392E2519}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A21DEE4B-F49B-4A19-95AC-7589757B8962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A21DEE4B-F49B-4A19-95AC-7589757B8962}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A21DEE4B-F49B-4A19-95AC-7589757B8962}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A21DEE4B-F49B-4A19-95AC-7589757B8962}.Release|Any CPU.Build.0 = Release|Any CPU
+		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{515F097D-9FFB-4728-8B9E-18CFA6916AD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F61FEA80-03CF-4F04-8362-EA64E3E27C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F61FEA80-03CF-4F04-8362-EA64E3E27C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F61FEA80-03CF-4F04-8362-EA64E3E27C58}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -113,14 +115,10 @@ Global
 		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Release|Any CPU.Build.0 = Release|Any CPU
 		{62D0B220-DABD-4C56-A0E2-640D74465328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62D0B220-DABD-4C56-A0E2-640D74465328}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62D0B220-DABD-4C56-A0E2-640D74465328}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -129,10 +127,14 @@ Global
 		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B67E21A5-9B87-46DB-99A1-F04074CBE466}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D99D47C-7A6B-4635-905B-891B3D5AF79B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DCDA242-48D4-4611-B4A3-7EDBF84A9127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DCDA242-48D4-4611-B4A3-7EDBF84A9127}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DCDA242-48D4-4611-B4A3-7EDBF84A9127}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -141,38 +143,42 @@ Global
 		{4C910A27-69A1-41EA-ABA1-976AE77DCE42}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C910A27-69A1-41EA-ABA1-976AE77DCE42}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C910A27-69A1-41EA-ABA1-976AE77DCE42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3D501DAC-12C1-4423-AE63-7157624B65DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF5C6565-09EE-4E1F-A146-72785C0FF66F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B6F17F1-1501-4C06-82D7-7BE1A3688B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B6F17F1-1501-4C06-82D7-7BE1A3688B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B6F17F1-1501-4C06-82D7-7BE1A3688B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B6F17F1-1501-4C06-82D7-7BE1A3688B9A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E74341EE-52F2-4649-AB89-5CB3C7D6415F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E74341EE-52F2-4649-AB89-5CB3C7D6415F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E74341EE-52F2-4649-AB89-5CB3C7D6415F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E74341EE-52F2-4649-AB89-5CB3C7D6415F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{18516F07-CC8B-4009-9822-0AE194B30407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{18516F07-CC8B-4009-9822-0AE194B30407}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{18516F07-CC8B-4009-9822-0AE194B30407}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18516F07-CC8B-4009-9822-0AE194B30407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -182,34 +188,35 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{738E67B2-2339-4A33-AE35-27D426CFF6DC} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{D41F65C3-1D86-44FA-BE07-9E95392E2519} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{F61FEA80-03CF-4F04-8362-EA64E3E27C58} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{3D501DAC-12C1-4423-AE63-7157624B65DB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{E74341EE-52F2-4649-AB89-5CB3C7D6415F} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{18516F07-CC8B-4009-9822-0AE194B30407} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{E266D70D-9B9E-485D-B739-87E1DD31D11D} = {7787FAA0-0A1A-4FBE-B29A-A17EB080BEE1}
-		{5EA9057E-5887-4BDB-8785-A752D96D89F9} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{515F097D-9FFB-4728-8B9E-18CFA6916AD3} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{A21DEE4B-F49B-4A19-95AC-7589757B8962} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{1D99D47C-7A6B-4635-905B-891B3D5AF79B} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{AF5C6565-09EE-4E1F-A146-72785C0FF66F} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{62D0B220-DABD-4C56-A0E2-640D74465328} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{B67E21A5-9B87-46DB-99A1-F04074CBE466} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{3DCDA242-48D4-4611-B4A3-7EDBF84A9127} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{4C910A27-69A1-41EA-ABA1-976AE77DCE42} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
-		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170} = {FD104C22-7ECA-47DD-8877-26AC1E0E5ECC}
+		{5EA9057E-5887-4BDB-8785-A752D96D89F9} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{A21DEE4B-F49B-4A19-95AC-7589757B8962} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{515F097D-9FFB-4728-8B9E-18CFA6916AD3} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{B67E21A5-9B87-46DB-99A1-F04074CBE466} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{62D0B220-DABD-4C56-A0E2-640D74465328} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{1D99D47C-7A6B-4635-905B-891B3D5AF79B} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{3DCDA242-48D4-4611-B4A3-7EDBF84A9127} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{4C910A27-69A1-41EA-ABA1-976AE77DCE42} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{AF5C6565-09EE-4E1F-A146-72785C0FF66F} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170} = {D7B420EF-E739-4C94-A0D3-5F08E123F2BC}
+		{738E67B2-2339-4A33-AE35-27D426CFF6DC} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{D41F65C3-1D86-44FA-BE07-9E95392E2519} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{F61FEA80-03CF-4F04-8362-EA64E3E27C58} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{3D501DAC-12C1-4423-AE63-7157624B65DB} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{1B6F17F1-1501-4C06-82D7-7BE1A3688B9A} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{E74341EE-52F2-4649-AB89-5CB3C7D6415F} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{2D83CF5D-AF9E-4C38-ADE3-355266072DDB} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{18516F07-CC8B-4009-9822-0AE194B30407} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
+		{E266D70D-9B9E-485D-B739-87E1DD31D11D} = {2B44B3A8-313C-4037-B6CD-0BE958DF2133}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {88E9AE9C-34A3-4853-8244-9158CC50902D}
diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
index 5a6064ddaabe48..b01ca0a1c7550f 100644
--- a/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/Microsoft.Extensions.Logging.EventSource.sln
@@ -37,23 +37,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{E06E4463-281C-46C1-A4D6-4593742C1CBC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{86E73090-1C03-4B53-802A-0FFDB2FEBF6A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{23F45D4C-4E33-4334-A5BF-D34E24165E0B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5EAEB159-6569-4D3F-B7E4-313F8EBED61B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9A16DEC0-1F88-4335-95B3-D7923FEB5283}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{CAA8F0C4-00F3-49EA-A4AF-0491E4E1B8EF}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{4BF31DFE-A930-499C-B696-BB1958C08089}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{717611FD-9B9D-42E5-984D-70D6364F9B54}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{5A956452-F322-4C4F-8689-D2B425764293}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A06587C-82E8-4B40-9C0A-DD06CB986625}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4400CB7B-100B-448E-BD74-C619A3F45C6A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{887BF6A4-CB22-4DF4-8E24-A1B267161ECB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CD8B7673-469D-46E6-886B-764ACBCA00CD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -73,18 +79,18 @@ Global
 		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F5B4A3CF-03B5-40A2-BE78-DA6230270113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F5B4A3CF-03B5-40A2-BE78-DA6230270113}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F5B4A3CF-03B5-40A2-BE78-DA6230270113}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F5B4A3CF-03B5-40A2-BE78-DA6230270113}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB4E6DC3-4F30-4315-884A-243077FE68C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,10 +99,6 @@ Global
 		{AD133460-B832-44BE-BF0A-A699A77FA718}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD133460-B832-44BE-BF0A-A699A77FA718}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD133460-B832-44BE-BF0A-A699A77FA718}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4A703F8-3D69-4113-A86F-9AD908086092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4A703F8-3D69-4113-A86F-9AD908086092}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4A703F8-3D69-4113-A86F-9AD908086092}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4A703F8-3D69-4113-A86F-9AD908086092}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -105,14 +107,14 @@ Global
 		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4A703F8-3D69-4113-A86F-9AD908086092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4A703F8-3D69-4113-A86F-9AD908086092}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4A703F8-3D69-4113-A86F-9AD908086092}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4A703F8-3D69-4113-A86F-9AD908086092}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E06E4463-281C-46C1-A4D6-4593742C1CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E06E4463-281C-46C1-A4D6-4593742C1CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E06E4463-281C-46C1-A4D6-4593742C1CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E06E4463-281C-46C1-A4D6-4593742C1CBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A956452-F322-4C4F-8689-D2B425764293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A956452-F322-4C4F-8689-D2B425764293}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A956452-F322-4C4F-8689-D2B425764293}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A956452-F322-4C4F-8689-D2B425764293}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,6 +123,10 @@ Global
 		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A956452-F322-4C4F-8689-D2B425764293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A956452-F322-4C4F-8689-D2B425764293}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A956452-F322-4C4F-8689-D2B425764293}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A956452-F322-4C4F-8689-D2B425764293}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -137,10 +143,6 @@ Global
 		{0C1BD2DA-FA39-458E-8BCB-0D73231C43D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C1BD2DA-FA39-458E-8BCB-0D73231C43D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C1BD2DA-FA39-458E-8BCB-0D73231C43D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -149,6 +151,18 @@ Global
 		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B73EC56E-61AB-4857-903D-F5C4BDDD2357}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{717611FD-9B9D-42E5-984D-70D6364F9B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{717611FD-9B9D-42E5-984D-70D6364F9B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{717611FD-9B9D-42E5-984D-70D6364F9B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{717611FD-9B9D-42E5-984D-70D6364F9B54}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,40 +171,47 @@ Global
 		{4BF31DFE-A930-499C-B696-BB1958C08089}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BF31DFE-A930-499C-B696-BB1958C08089}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4BF31DFE-A930-499C-B696-BB1958C08089}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF689C53-9B62-4E17-B412-92FAD527FA59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAA8F0C4-00F3-49EA-A4AF-0491E4E1B8EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAA8F0C4-00F3-49EA-A4AF-0491E4E1B8EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAA8F0C4-00F3-49EA-A4AF-0491E4E1B8EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAA8F0C4-00F3-49EA-A4AF-0491E4E1B8EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86E73090-1C03-4B53-802A-0FFDB2FEBF6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86E73090-1C03-4B53-802A-0FFDB2FEBF6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86E73090-1C03-4B53-802A-0FFDB2FEBF6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86E73090-1C03-4B53-802A-0FFDB2FEBF6A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{39B2002C-CA45-4491-BF24-A683FED4F305} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{BB4E6DC3-4F30-4315-884A-243077FE68C0} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{F5B4A3CF-03B5-40A2-BE78-DA6230270113} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{1CFC41DE-18F8-4993-9B5D-64655D043158} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{B73EC56E-61AB-4857-903D-F5C4BDDD2357} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{EF689C53-9B62-4E17-B412-92FAD527FA59} = {5A06587C-82E8-4B40-9C0A-DD06CB986625}
-		{7939B14F-FDE9-468C-8307-8CC1220EBC2A} = {AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3}
-		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976} = {AFF4CCE7-94BD-42B0-8310-8D4CD00F18D3}
-		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{AD133460-B832-44BE-BF0A-A699A77FA718} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{F4A703F8-3D69-4113-A86F-9AD908086092} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{E06E4463-281C-46C1-A4D6-4593742C1CBC} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{5A956452-F322-4C4F-8689-D2B425764293} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{9A16DEC0-1F88-4335-95B3-D7923FEB5283} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{0C1BD2DA-FA39-458E-8BCB-0D73231C43D3} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{23F45D4C-4E33-4334-A5BF-D34E24165E0B} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
-		{4BF31DFE-A930-499C-B696-BB1958C08089} = {887BF6A4-CB22-4DF4-8E24-A1B267161ECB}
+		{39B2002C-CA45-4491-BF24-A683FED4F305} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{F5B4A3CF-03B5-40A2-BE78-DA6230270113} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{BB4E6DC3-4F30-4315-884A-243077FE68C0} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{1CFC41DE-18F8-4993-9B5D-64655D043158} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{B73EC56E-61AB-4857-903D-F5C4BDDD2357} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{EF689C53-9B62-4E17-B412-92FAD527FA59} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{717611FD-9B9D-42E5-984D-70D6364F9B54} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{CAA8F0C4-00F3-49EA-A4AF-0491E4E1B8EF} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{86E73090-1C03-4B53-802A-0FFDB2FEBF6A} = {3EDB4D86-ACFE-44EA-BF5E-FD5726FE572F}
+		{7939B14F-FDE9-468C-8307-8CC1220EBC2A} = {4400CB7B-100B-448E-BD74-C619A3F45C6A}
+		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976} = {4400CB7B-100B-448E-BD74-C619A3F45C6A}
+		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{AD133460-B832-44BE-BF0A-A699A77FA718} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{F4A703F8-3D69-4113-A86F-9AD908086092} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{E06E4463-281C-46C1-A4D6-4593742C1CBC} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{9A16DEC0-1F88-4335-95B3-D7923FEB5283} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{5A956452-F322-4C4F-8689-D2B425764293} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{0C1BD2DA-FA39-458E-8BCB-0D73231C43D3} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{23F45D4C-4E33-4334-A5BF-D34E24165E0B} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
+		{4BF31DFE-A930-499C-B696-BB1958C08089} = {CD8B7673-469D-46E6-886B-764ACBCA00CD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {67B715CE-2E67-4605-BFB0-CA65F345C3A5}
diff --git a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
index bcfcc830a1c42d..d9725e08ebeaf8 100644
--- a/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.TraceSource/Microsoft.Extensions.Logging.TraceSource.sln
@@ -33,15 +33,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{59BC50A1-510F-44A4-A507-AEC051EA8908}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{237ADE75-97CB-4B3A-87FA-7B209C52E5EC}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{D72BF608-9C7C-41BE-9288-22BA49AF954F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5D92F57D-42F4-4B37-907C-25D06233FDBB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9635EB28-5AEA-40A1-B59E-A2C7CA21376F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C9FA428B-8564-4791-8CBF-2438F4783124}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,50 +51,50 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC92BF65-8FA0-49C0-911F-426F21090774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC92BF65-8FA0-49C0-911F-426F21090774}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC92BF65-8FA0-49C0-911F-426F21090774}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC92BF65-8FA0-49C0-911F-426F21090774}.Release|Any CPU.Build.0 = Release|Any CPU
-		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A9250A96-9B27-46C5-A043-11F67D63B128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9250A96-9B27-46C5-A043-11F67D63B128}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9250A96-9B27-46C5-A043-11F67D63B128}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9250A96-9B27-46C5-A043-11F67D63B128}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{367922CE-A24E-4977-89BE-D1F2F678F8B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B7B708C-F860-478E-B3D4-1CB70E71A440}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4DE0466-D21E-4CAF-9307-999478A64D5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A64CC82B-B781-4469-B009-49A43A0A2A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A64CC82B-B781-4469-B009-49A43A0A2A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A64CC82B-B781-4469-B009-49A43A0A2A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -109,14 +111,14 @@ Global
 		{D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F1FF12D-6CAF-409D-BF8D-E299646B545C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C0F647A3-A299-441F-BE78-67022E0683E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C0F647A3-A299-441F-BE78-67022E0683E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C0F647A3-A299-441F-BE78-67022E0683E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -125,6 +127,10 @@ Global
 		{59BC50A1-510F-44A4-A507-AEC051EA8908}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59BC50A1-510F-44A4-A507-AEC051EA8908}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59BC50A1-510F-44A4-A507-AEC051EA8908}.Release|Any CPU.Build.0 = Release|Any CPU
+		{237ADE75-97CB-4B3A-87FA-7B209C52E5EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{237ADE75-97CB-4B3A-87FA-7B209C52E5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{237ADE75-97CB-4B3A-87FA-7B209C52E5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{237ADE75-97CB-4B3A-87FA-7B209C52E5EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5D92F57D-42F4-4B37-907C-25D06233FDBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5D92F57D-42F4-4B37-907C-25D06233FDBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5D92F57D-42F4-4B37-907C-25D06233FDBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -134,26 +140,27 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{367922CE-A24E-4977-89BE-D1F2F678F8B2} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{D72D9E03-5346-4E9E-9617-45BE57AB95E0} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{3F1FF12D-6CAF-409D-BF8D-E299646B545C} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{C0F647A3-A299-441F-BE78-67022E0683E6} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{5D92F57D-42F4-4B37-907C-25D06233FDBB} = {C9FA428B-8564-4791-8CBF-2438F4783124}
-		{BC92BF65-8FA0-49C0-911F-426F21090774} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{A9250A96-9B27-46C5-A043-11F67D63B128} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{F4DE0466-D21E-4CAF-9307-999478A64D5B} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{1B7B708C-F860-478E-B3D4-1CB70E71A440} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{A64CC82B-B781-4469-B009-49A43A0A2A96} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{D72BF608-9C7C-41BE-9288-22BA49AF954F} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
-		{59BC50A1-510F-44A4-A507-AEC051EA8908} = {DFF3B3E7-DC70-46BC-8EDC-DC73CD69F7FC}
+		{BC92BF65-8FA0-49C0-911F-426F21090774} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{A9250A96-9B27-46C5-A043-11F67D63B128} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{1B7B708C-F860-478E-B3D4-1CB70E71A440} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{F4DE0466-D21E-4CAF-9307-999478A64D5B} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{A64CC82B-B781-4469-B009-49A43A0A2A96} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{D72BF608-9C7C-41BE-9288-22BA49AF954F} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{59BC50A1-510F-44A4-A507-AEC051EA8908} = {700F1DE1-9DAA-4BD3-9145-ABA1C036CE4B}
+		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{367922CE-A24E-4977-89BE-D1F2F678F8B2} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{D72D9E03-5346-4E9E-9617-45BE57AB95E0} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{3F1FF12D-6CAF-409D-BF8D-E299646B545C} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{C0F647A3-A299-441F-BE78-67022E0683E6} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{237ADE75-97CB-4B3A-87FA-7B209C52E5EC} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
+		{5D92F57D-42F4-4B37-907C-25D06233FDBB} = {D9EA39FA-432A-4BB9-B094-E79F0E0A8EFA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3375EACB-CFC1-4E7B-8A64-C346BD35E354}
diff --git a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
index 1c394d4f996b8e..2e97d6c801ff21 100644
--- a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
+++ b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
@@ -91,6 +91,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{E41BE1F8-AB36-414F-A914-62C7E1915473}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{B7FAB1E6-D8DD-49CD-A84F-854584DB412C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{7CB59805-CD93-4D2A-BD21-A97820DD35B0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{DD948842-60C4-4385-9F0B-9B2702379A9E}"
@@ -107,10 +109,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{44810380-98AC-4AD7-956D-191AB02C4EE6}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{B5B30447-25D0-42C0-920A-092247C95664}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{B4313086-0B16-4A80-BA04-964F64745DC2}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{7DC04B95-ADA9-4EDA-AA45-B1EBFF5F889E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{5FF1A443-F491-428F-9121-51523AA65052}"
@@ -119,11 +125,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{7467E5B1-7454-4277-A84F-E8BE34A80CE4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F7172ED9-1D53-41E1-8511-0BD739E503AC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C4849A9-0DE8-4184-85B0-11FC5A0833A9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B9BABBAD-140B-429C-9EB5-F8CC3D92C247}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8928AB2-2939-4421-90C5-56B789BF93E5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -131,6 +137,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{78D7E710-1AE5-408B-AE64-99382A819D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78D7E710-1AE5-408B-AE64-99382A819D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78D7E710-1AE5-408B-AE64-99382A819D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78D7E710-1AE5-408B-AE64-99382A819D09}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -139,14 +149,14 @@ Global
 		{8BA3C396-9F2E-4671-BC07-221DC714B855}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8BA3C396-9F2E-4671-BC07-221DC714B855}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8BA3C396-9F2E-4671-BC07-221DC714B855}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78D7E710-1AE5-408B-AE64-99382A819D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78D7E710-1AE5-408B-AE64-99382A819D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78D7E710-1AE5-408B-AE64-99382A819D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78D7E710-1AE5-408B-AE64-99382A819D09}.Release|Any CPU.Build.0 = Release|Any CPU
 		{91E18134-CEEA-4E42-9620-C4120EF34AEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91E18134-CEEA-4E42-9620-C4120EF34AEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{91E18134-CEEA-4E42-9620-C4120EF34AEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91E18134-CEEA-4E42-9620-C4120EF34AEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -155,10 +165,6 @@ Global
 		{5CC86773-7762-4FB7-9B6E-F4002F286AD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5CC86773-7762-4FB7-9B6E-F4002F286AD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5CC86773-7762-4FB7-9B6E-F4002F286AD4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B33E878-3451-4B2E-9AC5-849F77EE02D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -175,22 +181,22 @@ Global
 		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25E16BD1-98CA-482E-87BB-3A2A596503C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25E16BD1-98CA-482E-87BB-3A2A596503C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25E16BD1-98CA-482E-87BB-3A2A596503C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25E16BD1-98CA-482E-87BB-3A2A596503C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF5604F2-EDD6-4A63-8E60-E327D91BA532}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F700E4AF-073D-4C1D-A8C2-84E744EBC374}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7CB59805-CD93-4D2A-BD21-A97820DD35B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7CB59805-CD93-4D2A-BD21-A97820DD35B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CB59805-CD93-4D2A-BD21-A97820DD35B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -215,22 +221,34 @@ Global
 		{56738F24-0431-4782-98E2-2DC4B77BF831}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56738F24-0431-4782-98E2-2DC4B77BF831}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56738F24-0431-4782-98E2-2DC4B77BF831}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56A5DED2-47C2-4938-931E-B896A6BDDA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56A5DED2-47C2-4938-931E-B896A6BDDA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56A5DED2-47C2-4938-931E-B896A6BDDA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56A5DED2-47C2-4938-931E-B896A6BDDA0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BECB0DC7-4194-4C4F-B821-8C8410303013}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04BA3E3C-6979-4792-B19E-C797AD607F42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -239,42 +257,34 @@ Global
 		{AB6345AD-EF69-42DD-BC90-5A7FE394358F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB6345AD-EF69-42DD-BC90-5A7FE394358F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB6345AD-EF69-42DD-BC90-5A7FE394358F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FDFE85B-20C3-493F-AF29-B39718761A85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FDFE85B-20C3-493F-AF29-B39718761A85}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6FDFE85B-20C3-493F-AF29-B39718761A85}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6FDFE85B-20C3-493F-AF29-B39718761A85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{425C299F-7D53-49EC-92D0-22B77BEA12D2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889}.Release|Any CPU.Build.0 = Release|Any CPU
-		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31E317F8-F766-4EC3-8101-2D92CDB407CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7FAB1E6-D8DD-49CD-A84F-854584DB412C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7FAB1E6-D8DD-49CD-A84F-854584DB412C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7FAB1E6-D8DD-49CD-A84F-854584DB412C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7FAB1E6-D8DD-49CD-A84F-854584DB412C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E41BE1F8-AB36-414F-A914-62C7E1915473}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E41BE1F8-AB36-414F-A914-62C7E1915473}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E41BE1F8-AB36-414F-A914-62C7E1915473}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -283,90 +293,98 @@ Global
 		{012BA90D-8171-4C14-A811-5B1C7B239B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{012BA90D-8171-4C14-A811-5B1C7B239B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{012BA90D-8171-4C14-A811-5B1C7B239B9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{504464B5-B163-4D6B-A113-52DDC78A401D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{504464B5-B163-4D6B-A113-52DDC78A401D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{504464B5-B163-4D6B-A113-52DDC78A401D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{504464B5-B163-4D6B-A113-52DDC78A401D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5B30447-25D0-42C0-920A-092247C95664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5B30447-25D0-42C0-920A-092247C95664}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5B30447-25D0-42C0-920A-092247C95664}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5B30447-25D0-42C0-920A-092247C95664}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DC04B95-ADA9-4EDA-AA45-B1EBFF5F889E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DC04B95-ADA9-4EDA-AA45-B1EBFF5F889E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DC04B95-ADA9-4EDA-AA45-B1EBFF5F889E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DC04B95-ADA9-4EDA-AA45-B1EBFF5F889E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02437B60-112D-49D7-8C95-6118A147CC2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02437B60-112D-49D7-8C95-6118A147CC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02437B60-112D-49D7-8C95-6118A147CC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02437B60-112D-49D7-8C95-6118A147CC2A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B4313086-0B16-4A80-BA04-964F64745DC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B4313086-0B16-4A80-BA04-964F64745DC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B4313086-0B16-4A80-BA04-964F64745DC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B4313086-0B16-4A80-BA04-964F64745DC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{504464B5-B163-4D6B-A113-52DDC78A401D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{504464B5-B163-4D6B-A113-52DDC78A401D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{504464B5-B163-4D6B-A113-52DDC78A401D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{504464B5-B163-4D6B-A113-52DDC78A401D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD948842-60C4-4385-9F0B-9B2702379A9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5B30447-25D0-42C0-920A-092247C95664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5B30447-25D0-42C0-920A-092247C95664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5B30447-25D0-42C0-920A-092247C95664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5B30447-25D0-42C0-920A-092247C95664}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D698D832-B15A-4C2E-8C6A-D8F97044000A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D698D832-B15A-4C2E-8C6A-D8F97044000A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D698D832-B15A-4C2E-8C6A-D8F97044000A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D698D832-B15A-4C2E-8C6A-D8F97044000A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02437B60-112D-49D7-8C95-6118A147CC2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02437B60-112D-49D7-8C95-6118A147CC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02437B60-112D-49D7-8C95-6118A147CC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02437B60-112D-49D7-8C95-6118A147CC2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44810380-98AC-4AD7-956D-191AB02C4EE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44810380-98AC-4AD7-956D-191AB02C4EE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44810380-98AC-4AD7-956D-191AB02C4EE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44810380-98AC-4AD7-956D-191AB02C4EE6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5FF1A443-F491-428F-9121-51523AA65052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5FF1A443-F491-428F-9121-51523AA65052}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5FF1A443-F491-428F-9121-51523AA65052}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5FF1A443-F491-428F-9121-51523AA65052}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{86FE36DC-1F35-4939-8937-18541614EF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{86FE36DC-1F35-4939-8937-18541614EF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{86FE36DC-1F35-4939-8937-18541614EF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{86FE36DC-1F35-4939-8937-18541614EF6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49DDAE0B-EF27-4B28-8554-82F85234F48C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7467E5B1-7454-4277-A84F-E8BE34A80CE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7467E5B1-7454-4277-A84F-E8BE34A80CE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7467E5B1-7454-4277-A84F-E8BE34A80CE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7467E5B1-7454-4277-A84F-E8BE34A80CE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F61AC077-D30A-4F65-9831-5F9DC23B3561}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -376,66 +394,69 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{5CC86773-7762-4FB7-9B6E-F4002F286AD4} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{4B33E878-3451-4B2E-9AC5-849F77EE02D3} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{C4B04D68-8344-41D2-B46C-3BB5F31799EC} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{56738F24-0431-4782-98E2-2DC4B77BF831} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{BECB0DC7-4194-4C4F-B821-8C8410303013} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{6FDFE85B-20C3-493F-AF29-B39718761A85} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{012BA90D-8171-4C14-A811-5B1C7B239B9E} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{DD948842-60C4-4385-9F0B-9B2702379A9E} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{5FF1A443-F491-428F-9121-51523AA65052} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{49DDAE0B-EF27-4B28-8554-82F85234F48C} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{86FE36DC-1F35-4939-8937-18541614EF6D} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{F61AC077-D30A-4F65-9831-5F9DC23B3561} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{7467E5B1-7454-4277-A84F-E8BE34A80CE4} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660} = {E70034C8-3FE8-4A9E-9D2C-569FB4AE2AD7}
-		{8BA3C396-9F2E-4671-BC07-221DC714B855} = {5C4849A9-0DE8-4184-85B0-11FC5A0833A9}
-		{78D7E710-1AE5-408B-AE64-99382A819D09} = {5C4849A9-0DE8-4184-85B0-11FC5A0833A9}
-		{7F66E50D-B9E1-4229-85CE-61BCA70EA568} = {5C4849A9-0DE8-4184-85B0-11FC5A0833A9}
-		{91E18134-CEEA-4E42-9620-C4120EF34AEE} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{335D852A-CE30-4038-9AD4-B70B268BB69F} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{CF5604F2-EDD6-4A63-8E60-E327D91BA532} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{25E16BD1-98CA-482E-87BB-3A2A596503C7} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{F700E4AF-073D-4C1D-A8C2-84E744EBC374} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{7CB59805-CD93-4D2A-BD21-A97820DD35B0} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{4FAEF817-3333-4813-86FF-F0255E000F7D} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{04BA3E3C-6979-4792-B19E-C797AD607F42} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{56A5DED2-47C2-4938-931E-B896A6BDDA0D} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{AB6345AD-EF69-42DD-BC90-5A7FE394358F} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{31E317F8-F766-4EC3-8101-2D92CDB407CD} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{425C299F-7D53-49EC-92D0-22B77BEA12D2} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{E41BE1F8-AB36-414F-A914-62C7E1915473} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{B5B30447-25D0-42C0-920A-092247C95664} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{B4313086-0B16-4A80-BA04-964F64745DC2} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{504464B5-B163-4D6B-A113-52DDC78A401D} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{D698D832-B15A-4C2E-8C6A-D8F97044000A} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{02437B60-112D-49D7-8C95-6118A147CC2A} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
-		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A} = {D8928AB2-2939-4421-90C5-56B789BF93E5}
+		{78D7E710-1AE5-408B-AE64-99382A819D09} = {F7172ED9-1D53-41E1-8511-0BD739E503AC}
+		{8BA3C396-9F2E-4671-BC07-221DC714B855} = {F7172ED9-1D53-41E1-8511-0BD739E503AC}
+		{7F66E50D-B9E1-4229-85CE-61BCA70EA568} = {F7172ED9-1D53-41E1-8511-0BD739E503AC}
+		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{4B33E878-3451-4B2E-9AC5-849F77EE02D3} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{5CC86773-7762-4FB7-9B6E-F4002F286AD4} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{C4B04D68-8344-41D2-B46C-3BB5F31799EC} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{56738F24-0431-4782-98E2-2DC4B77BF831} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{BECB0DC7-4194-4C4F-B821-8C8410303013} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{6FDFE85B-20C3-493F-AF29-B39718761A85} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{B7FAB1E6-D8DD-49CD-A84F-854584DB412C} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{012BA90D-8171-4C14-A811-5B1C7B239B9E} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{DD948842-60C4-4385-9F0B-9B2702379A9E} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{7DC04B95-ADA9-4EDA-AA45-B1EBFF5F889E} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{44810380-98AC-4AD7-956D-191AB02C4EE6} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{5FF1A443-F491-428F-9121-51523AA65052} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{86FE36DC-1F35-4939-8937-18541614EF6D} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{49DDAE0B-EF27-4B28-8554-82F85234F48C} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{7467E5B1-7454-4277-A84F-E8BE34A80CE4} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{F61AC077-D30A-4F65-9831-5F9DC23B3561} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660} = {B9BABBAD-140B-429C-9EB5-F8CC3D92C247}
+		{91E18134-CEEA-4E42-9620-C4120EF34AEE} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{335D852A-CE30-4038-9AD4-B70B268BB69F} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{25E16BD1-98CA-482E-87BB-3A2A596503C7} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{CF5604F2-EDD6-4A63-8E60-E327D91BA532} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{F700E4AF-073D-4C1D-A8C2-84E744EBC374} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{7CB59805-CD93-4D2A-BD21-A97820DD35B0} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{4FAEF817-3333-4813-86FF-F0255E000F7D} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{56A5DED2-47C2-4938-931E-B896A6BDDA0D} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{04BA3E3C-6979-4792-B19E-C797AD607F42} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{425C299F-7D53-49EC-92D0-22B77BEA12D2} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{AB6345AD-EF69-42DD-BC90-5A7FE394358F} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{31E317F8-F766-4EC3-8101-2D92CDB407CD} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{E41BE1F8-AB36-414F-A914-62C7E1915473} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{D81BE8A0-A710-4B74-8AA7-1733B3DCC461} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{504464B5-B163-4D6B-A113-52DDC78A401D} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{02437B60-112D-49D7-8C95-6118A147CC2A} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{B4313086-0B16-4A80-BA04-964F64745DC2} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{B5B30447-25D0-42C0-920A-092247C95664} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{D698D832-B15A-4C2E-8C6A-D8F97044000A} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
+		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A} = {734C4185-DA10-4E4C-B2D4-6AF6EDDBAE0B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B57B7C13-740F-4482-B7B6-B5E87014ACB1}
diff --git a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
index 20100a69c0f5a0..a41218efb72328 100644
--- a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
+++ b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
@@ -113,6 +113,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primit
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{339EFC3C-9255-40EE-983B-8D28C957B151}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj", "{429C9D71-4BBD-489D-9C86-EC240F652008}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{11773B90-8DAC-4B51-A4B6-7C64FD6942BD}"
@@ -129,10 +131,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{64388157-7D8E-41C3-B514-943A0E6E4250}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{65F8AA03-4B7D-450B-B1C8-149FE2946139}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{59D31D62-3BF9-4F4A-9FF7-3A61F297F714}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{E9FC7E56-94AA-4395-A128-D644969DC2C6}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{39D50C3D-609B-4B4E-955F-252E469A55C9}"
@@ -141,11 +147,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessCont
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{20CF481A-FE52-4390-9545-03DE5654787A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7C1317AA-5F4C-42A4-80F3-856BA5E204AF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{72A090A3-FE14-4F4E-B266-EFFB5C736462}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{754F24D9-B43C-4DCB-96F8-C6ACC0780B01}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7028EE0A-D314-4F48-91CA-51A1633BC3F4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{692D93BA-4F32-4725-8D5C-C5E00EED25DB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -153,22 +159,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -181,22 +183,26 @@ Global
 		{D4256787-48E0-473F-8C06-359C1BCFC8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D4256787-48E0-473F-8C06-359C1BCFC8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4256787-48E0-473F-8C06-359C1BCFC8AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Release|Any CPU.Build.0 = Release|Any CPU
 		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6AD51705-102E-4E9D-B62E-6BF19025F3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AD51705-102E-4E9D-B62E-6BF19025F3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AD51705-102E-4E9D-B62E-6BF19025F3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6AD51705-102E-4E9D-B62E-6BF19025F3A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -217,30 +223,6 @@ Global
 		{66E30CB1-ADA8-4000-9CEE-56AF40323D23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66E30CB1-ADA8-4000-9CEE-56AF40323D23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66E30CB1-ADA8-4000-9CEE-56AF40323D23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02C282B1-23DD-429A-ADC7-345D661557E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02C282B1-23DD-429A-ADC7-345D661557E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02C282B1-23DD-429A-ADC7-345D661557E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02C282B1-23DD-429A-ADC7-345D661557E1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -249,18 +231,22 @@ Global
 		{DAD9293C-DB4F-45DE-A1BB-D857B02A0764}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DAD9293C-DB4F-45DE-A1BB-D857B02A0764}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DAD9293C-DB4F-45DE-A1BB-D857B02A0764}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{355E3E07-8273-4660-AE2C-8603A0757C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{355E3E07-8273-4660-AE2C-8603A0757C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{355E3E07-8273-4660-AE2C-8603A0757C4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{355E3E07-8273-4660-AE2C-8603A0757C4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A4A1183-A0CF-4270-8EF9-12018D9DADB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A4A1183-A0CF-4270-8EF9-12018D9DADB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A4A1183-A0CF-4270-8EF9-12018D9DADB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -273,14 +259,14 @@ Global
 		{D0932BA0-70BF-4A98-9A30-ED563AB2BFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0932BA0-70BF-4A98-9A30-ED563AB2BFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0932BA0-70BF-4A98-9A30-ED563AB2BFB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{56D37CB2-68A3-42D3-AA0E-416813ABAD8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{56D37CB2-68A3-42D3-AA0E-416813ABAD8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56D37CB2-68A3-42D3-AA0E-416813ABAD8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56D37CB2-68A3-42D3-AA0E-416813ABAD8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA91110F-C553-45E4-93E7-948A93AD09AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9EBA168F-239A-46C4-8614-E1D3DB25DD0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9EBA168F-239A-46C4-8614-E1D3DB25DD0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9EBA168F-239A-46C4-8614-E1D3DB25DD0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -289,34 +275,54 @@ Global
 		{47B5D904-4787-49E3-9894-31F8B7BE6755}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47B5D904-4787-49E3-9894-31F8B7BE6755}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47B5D904-4787-49E3-9894-31F8B7BE6755}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E400E69-1699-412B-A202-764A967A6E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E400E69-1699-412B-A202-764A967A6E51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E400E69-1699-412B-A202-764A967A6E51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E400E69-1699-412B-A202-764A967A6E51}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F2C68B0-A922-4455-BAF3-335E44DF6BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F2C68B0-A922-4455-BAF3-335E44DF6BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F2C68B0-A922-4455-BAF3-335E44DF6BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F2C68B0-A922-4455-BAF3-335E44DF6BB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E400E69-1699-412B-A202-764A967A6E51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E400E69-1699-412B-A202-764A967A6E51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E400E69-1699-412B-A202-764A967A6E51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E400E69-1699-412B-A202-764A967A6E51}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3B41A00-2E87-49F5-9A48-B03E528A6577}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F656E22F-D8D2-4C8A-A435-01F821A1EA07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02C282B1-23DD-429A-ADC7-345D661557E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02C282B1-23DD-429A-ADC7-345D661557E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02C282B1-23DD-429A-ADC7-345D661557E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02C282B1-23DD-429A-ADC7-345D661557E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD668E6C-9DD5-456E-A23A-9880A779CA14}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830}.Release|Any CPU.Build.0 = Release|Any CPU
+		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E90DFC5-7D40-42E4-ADF6-7090015B7211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E90DFC5-7D40-42E4-ADF6-7090015B7211}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E90DFC5-7D40-42E4-ADF6-7090015B7211}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E90DFC5-7D40-42E4-ADF6-7090015B7211}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B559A43F-4502-4D1B-B8C0-2822DDD8A68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B559A43F-4502-4D1B-B8C0-2822DDD8A68C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B559A43F-4502-4D1B-B8C0-2822DDD8A68C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -325,10 +331,10 @@ Global
 		{FFA18D8E-A4A1-4F33-80A6-BD7600E71E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FFA18D8E-A4A1-4F33-80A6-BD7600E71E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FFA18D8E-A4A1-4F33-80A6-BD7600E71E91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{732B0524-C9F0-4752-AD19-5275E863C6E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{195DC43D-4D6C-4631-969F-E89547A84A8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{195DC43D-4D6C-4631-969F-E89547A84A8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{195DC43D-4D6C-4631-969F-E89547A84A8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -337,26 +343,30 @@ Global
 		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05161D6B-0451-43B9-B648-71B7628F2A78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36D778AF-5EC3-433F-B03D-EB244DB3C227}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA0A7586-364A-4F3B-A9A8-07704D789C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA0A7586-364A-4F3B-A9A8-07704D789C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA0A7586-364A-4F3B-A9A8-07704D789C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA0A7586-364A-4F3B-A9A8-07704D789C23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0641221C-4409-4805-8CA4-4023809D5AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0641221C-4409-4805-8CA4-4023809D5AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0641221C-4409-4805-8CA4-4023809D5AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0641221C-4409-4805-8CA4-4023809D5AD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{37B75F58-26C3-4BD8-8285-C94F2B00DFD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37B75F58-26C3-4BD8-8285-C94F2B00DFD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37B75F58-26C3-4BD8-8285-C94F2B00DFD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -365,14 +375,6 @@ Global
 		{429C9D71-4BBD-489D-9C86-EC240F652008}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{429C9D71-4BBD-489D-9C86-EC240F652008}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{429C9D71-4BBD-489D-9C86-EC240F652008}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0641221C-4409-4805-8CA4-4023809D5AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0641221C-4409-4805-8CA4-4023809D5AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0641221C-4409-4805-8CA4-4023809D5AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0641221C-4409-4805-8CA4-4023809D5AD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6AAFBB84-9FF1-4E16-9309-6A0A251EE420}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6AAFBB84-9FF1-4E16-9309-6A0A251EE420}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6AAFBB84-9FF1-4E16-9309-6A0A251EE420}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -381,10 +383,6 @@ Global
 		{5DBF771C-E3DE-4538-BB8B-33029EDA0BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5DBF771C-E3DE-4538-BB8B-33029EDA0BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DBF771C-E3DE-4538-BB8B-33029EDA0BCB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB19F6BB-E51B-4B37-AF0F-63348C7FF48E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB19F6BB-E51B-4B37-AF0F-63348C7FF48E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB19F6BB-E51B-4B37-AF0F-63348C7FF48E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -393,22 +391,42 @@ Global
 		{9175023F-6982-45CD-B360-C4FC1E145B25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9175023F-6982-45CD-B360-C4FC1E145B25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9175023F-6982-45CD-B360-C4FC1E145B25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5570AF22-F440-4887-BFC9-CB9B557712D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9A3C3E5-78C9-44B3-9C8B-B764DD8DEA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9A3C3E5-78C9-44B3-9C8B-B764DD8DEA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9A3C3E5-78C9-44B3-9C8B-B764DD8DEA08}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9A3C3E5-78C9-44B3-9C8B-B764DD8DEA08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F7512BA-9B15-4395-AE05-C546F0770344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F7512BA-9B15-4395-AE05-C546F0770344}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F7512BA-9B15-4395-AE05-C546F0770344}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F7512BA-9B15-4395-AE05-C546F0770344}.Release|Any CPU.Build.0 = Release|Any CPU
-		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6671471B-2885-457C-9F63-D43DF9DC31C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9FC7E56-94AA-4395-A128-D644969DC2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9FC7E56-94AA-4395-A128-D644969DC2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9FC7E56-94AA-4395-A128-D644969DC2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9FC7E56-94AA-4395-A128-D644969DC2C6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{59D31D62-3BF9-4F4A-9FF7-3A61F297F714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{59D31D62-3BF9-4F4A-9FF7-3A61F297F714}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{59D31D62-3BF9-4F4A-9FF7-3A61F297F714}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{59D31D62-3BF9-4F4A-9FF7-3A61F297F714}.Release|Any CPU.Build.0 = Release|Any CPU
+		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F7512BA-9B15-4395-AE05-C546F0770344}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F7512BA-9B15-4395-AE05-C546F0770344}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F7512BA-9B15-4395-AE05-C546F0770344}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F7512BA-9B15-4395-AE05-C546F0770344}.Release|Any CPU.Build.0 = Release|Any CPU
+		{339EFC3C-9255-40EE-983B-8D28C957B151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{339EFC3C-9255-40EE-983B-8D28C957B151}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{339EFC3C-9255-40EE-983B-8D28C957B151}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{339EFC3C-9255-40EE-983B-8D28C957B151}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B82AF93C-33D7-4B48-B36E-A9873D74601C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B82AF93C-33D7-4B48-B36E-A9873D74601C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B82AF93C-33D7-4B48-B36E-A9873D74601C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -417,10 +435,10 @@ Global
 		{11773B90-8DAC-4B51-A4B6-7C64FD6942BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11773B90-8DAC-4B51-A4B6-7C64FD6942BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11773B90-8DAC-4B51-A4B6-7C64FD6942BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65F8AA03-4B7D-450B-B1C8-149FE2946139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65F8AA03-4B7D-450B-B1C8-149FE2946139}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65F8AA03-4B7D-450B-B1C8-149FE2946139}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65F8AA03-4B7D-450B-B1C8-149FE2946139}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39D50C3D-609B-4B4E-955F-252E469A55C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39D50C3D-609B-4B4E-955F-252E469A55C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39D50C3D-609B-4B4E-955F-252E469A55C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -442,77 +460,80 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
-		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9} = {7C1317AA-5F4C-42A4-80F3-856BA5E204AF}
-		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{201C7D67-FB1D-4259-9DB4-BF188007F9EA} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{692645D6-1F0B-4DB0-85EB-7D4042857B2D} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{CD668E6C-9DD5-456E-A23A-9880A779CA14} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{02C282B1-23DD-429A-ADC7-345D661557E1} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{F3B41A00-2E87-49F5-9A48-B03E528A6577} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{5E90DFC5-7D40-42E4-ADF6-7090015B7211} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{6671471B-2885-457C-9F63-D43DF9DC31C3} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{B559A43F-4502-4D1B-B8C0-2822DDD8A68C} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{FFA18D8E-A4A1-4F33-80A6-BD7600E71E91} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{732B0524-C9F0-4752-AD19-5275E863C6E0} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{195DC43D-4D6C-4631-969F-E89547A84A8D} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{05161D6B-0451-43B9-B648-71B7628F2A78} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{AA0A7586-364A-4F3B-A9A8-07704D789C23} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{37B75F58-26C3-4BD8-8285-C94F2B00DFD6} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{6AAFBB84-9FF1-4E16-9309-6A0A251EE420} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{5DBF771C-E3DE-4538-BB8B-33029EDA0BCB} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{5570AF22-F440-4887-BFC9-CB9B557712D3} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{CB19F6BB-E51B-4B37-AF0F-63348C7FF48E} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{E9A3C3E5-78C9-44B3-9C8B-B764DD8DEA08} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{6F7512BA-9B15-4395-AE05-C546F0770344} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{11773B90-8DAC-4B51-A4B6-7C64FD6942BD} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{39D50C3D-609B-4B4E-955F-252E469A55C9} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{64388157-7D8E-41C3-B514-943A0E6E4250} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{20CF481A-FE52-4390-9545-03DE5654787A} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{C88CD350-8273-454E-825B-720DFFA5AE05} = {72A090A3-FE14-4F4E-B266-EFFB5C736462}
-		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{D4256787-48E0-473F-8C06-359C1BCFC8AB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{6AD51705-102E-4E9D-B62E-6BF19025F3A7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{66E30CB1-ADA8-4000-9CEE-56AF40323D23} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{F656E22F-D8D2-4C8A-A435-01F821A1EA07} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{DAD9293C-DB4F-45DE-A1BB-D857B02A0764} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{355E3E07-8273-4660-AE2C-8603A0757C4B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{6A4A1183-A0CF-4270-8EF9-12018D9DADB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{3C56A02F-4DD8-4253-99E7-34E088A6A9D7} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{D0932BA0-70BF-4A98-9A30-ED563AB2BFB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{DA91110F-C553-45E4-93E7-948A93AD09AF} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{56D37CB2-68A3-42D3-AA0E-416813ABAD8B} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{9EBA168F-239A-46C4-8614-E1D3DB25DD0E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{47B5D904-4787-49E3-9894-31F8B7BE6755} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{3E400E69-1699-412B-A202-764A967A6E51} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{7F2C68B0-A922-4455-BAF3-335E44DF6BB9} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{36D778AF-5EC3-433F-B03D-EB244DB3C227} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{429C9D71-4BBD-489D-9C86-EC240F652008} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{0641221C-4409-4805-8CA4-4023809D5AD1} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{9175023F-6982-45CD-B360-C4FC1E145B25} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{59D31D62-3BF9-4F4A-9FF7-3A61F297F714} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{B82AF93C-33D7-4B48-B36E-A9873D74601C} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
-		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F} = {7028EE0A-D314-4F48-91CA-51A1633BC3F4}
+		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{201C7D67-FB1D-4259-9DB4-BF188007F9EA} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{692645D6-1F0B-4DB0-85EB-7D4042857B2D} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{F3B41A00-2E87-49F5-9A48-B03E528A6577} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{02C282B1-23DD-429A-ADC7-345D661557E1} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{CD668E6C-9DD5-456E-A23A-9880A779CA14} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{732B0524-C9F0-4752-AD19-5275E863C6E0} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{5E90DFC5-7D40-42E4-ADF6-7090015B7211} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{B559A43F-4502-4D1B-B8C0-2822DDD8A68C} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{FFA18D8E-A4A1-4F33-80A6-BD7600E71E91} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{91F2FFBB-8954-4707-A4FF-CF5DF23303E2} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{195DC43D-4D6C-4631-969F-E89547A84A8D} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{05161D6B-0451-43B9-B648-71B7628F2A78} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{AA0A7586-364A-4F3B-A9A8-07704D789C23} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{EFFB59C1-CAF4-4347-B996-4C773E1AFAA8} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{92B8FC4A-A8B5-4799-831D-F82A4BE16B39} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{37B75F58-26C3-4BD8-8285-C94F2B00DFD6} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{6AAFBB84-9FF1-4E16-9309-6A0A251EE420} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{5DBF771C-E3DE-4538-BB8B-33029EDA0BCB} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{CB19F6BB-E51B-4B37-AF0F-63348C7FF48E} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{5570AF22-F440-4887-BFC9-CB9B557712D3} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{E9A3C3E5-78C9-44B3-9C8B-B764DD8DEA08} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{6671471B-2885-457C-9F63-D43DF9DC31C3} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{E9FC7E56-94AA-4395-A128-D644969DC2C6} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{6F7512BA-9B15-4395-AE05-C546F0770344} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{339EFC3C-9255-40EE-983B-8D28C957B151} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{11773B90-8DAC-4B51-A4B6-7C64FD6942BD} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{65F8AA03-4B7D-450B-B1C8-149FE2946139} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{39D50C3D-609B-4B4E-955F-252E469A55C9} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{64388157-7D8E-41C3-B514-943A0E6E4250} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{20CF481A-FE52-4390-9545-03DE5654787A} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{C88CD350-8273-454E-825B-720DFFA5AE05} = {AD1BB8B1-D3BA-4944-8CDF-89253F6112CD}
+		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD} = {754F24D9-B43C-4DCB-96F8-C6ACC0780B01}
+		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9} = {754F24D9-B43C-4DCB-96F8-C6ACC0780B01}
+		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{D4256787-48E0-473F-8C06-359C1BCFC8AB} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{6AD51705-102E-4E9D-B62E-6BF19025F3A7} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{66E30CB1-ADA8-4000-9CEE-56AF40323D23} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{3975BEAC-6DB6-4CF7-B788-AA5B07D6CAC1} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{DAD9293C-DB4F-45DE-A1BB-D857B02A0764} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{0C4F3A7F-AAED-49A0-B8A3-B63CC83B345D} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{355E3E07-8273-4660-AE2C-8603A0757C4B} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{DEE4AA87-8EC4-41EE-A2A3-2DF6F494EAF2} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{6A4A1183-A0CF-4270-8EF9-12018D9DADB9} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{3C56A02F-4DD8-4253-99E7-34E088A6A9D7} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{D0932BA0-70BF-4A98-9A30-ED563AB2BFB9} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{56D37CB2-68A3-42D3-AA0E-416813ABAD8B} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{DA91110F-C553-45E4-93E7-948A93AD09AF} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{9EBA168F-239A-46C4-8614-E1D3DB25DD0E} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{47B5D904-4787-49E3-9894-31F8B7BE6755} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{7F2C68B0-A922-4455-BAF3-335E44DF6BB9} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{3E400E69-1699-412B-A202-764A967A6E51} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{A9E52F82-6B9C-4E07-919B-2B1BFFB21DBB} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{F656E22F-D8D2-4C8A-A435-01F821A1EA07} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{D7CEC738-5D2D-4FCB-9268-9650EB01BF31} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{36D778AF-5EC3-433F-B03D-EB244DB3C227} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{0641221C-4409-4805-8CA4-4023809D5AD1} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{429C9D71-4BBD-489D-9C86-EC240F652008} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{9175023F-6982-45CD-B360-C4FC1E145B25} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{59D31D62-3BF9-4F4A-9FF7-3A61F297F714} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{850A0E3B-1C09-40EF-8F3E-D61D93663C4E} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{99007CDD-4840-4B94-8A8A-FECF72BCEE3F} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
+		{B82AF93C-33D7-4B48-B36E-A9873D74601C} = {692D93BA-4F32-4725-8D5C-C5E00EED25DB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FE89CDC6-6313-439C-85D7-A81D5DF593E9}
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
index 1797f061bdcc0e..df2a520c9f6f5a 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
+++ b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
@@ -17,13 +17,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessContr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{3ECA4E78-310C-4E3F-BEB7-422340D9D87E}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{5A034C39-5FD7-4D66-A6F7-C3C68A767C07}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj", "{30CC7F8D-60DB-49C5-BE59-81477BFE0376}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A5727164-07A5-48ED-BA4C-0411EB3DF1D0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3FD0B41F-6CEA-4AE2-832F-60C8686858C4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6462E107-64BE-4E17-B768-19F8A01C4AAC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9047FE22-6B81-4C91-8222-07A69838D6CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -47,26 +49,30 @@ Global
 		{009D39C7-821B-44E4-ABB9-8ED94464A5CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{009D39C7-821B-44E4-ABB9-8ED94464A5CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{009D39C7-821B-44E4-ABB9-8ED94464A5CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1970A570-2766-49C2-83A4-9898E295D6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1970A570-2766-49C2-83A4-9898E295D6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1970A570-2766-49C2-83A4-9898E295D6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1970A570-2766-49C2-83A4-9898E295D6AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{30CC7F8D-60DB-49C5-BE59-81477BFE0376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30CC7F8D-60DB-49C5-BE59-81477BFE0376}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30CC7F8D-60DB-49C5-BE59-81477BFE0376}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{30CC7F8D-60DB-49C5-BE59-81477BFE0376}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1970A570-2766-49C2-83A4-9898E295D6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1970A570-2766-49C2-83A4-9898E295D6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1970A570-2766-49C2-83A4-9898E295D6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1970A570-2766-49C2-83A4-9898E295D6AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CABE2B33-0131-4889-AF63-A7241629C96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CABE2B33-0131-4889-AF63-A7241629C96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CABE2B33-0131-4889-AF63-A7241629C96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CABE2B33-0131-4889-AF63-A7241629C96A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CABE2B33-0131-4889-AF63-A7241629C96A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CABE2B33-0131-4889-AF63-A7241629C96A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CABE2B33-0131-4889-AF63-A7241629C96A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CABE2B33-0131-4889-AF63-A7241629C96A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A034C39-5FD7-4D66-A6F7-C3C68A767C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A034C39-5FD7-4D66-A6F7-C3C68A767C07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A034C39-5FD7-4D66-A6F7-C3C68A767C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A034C39-5FD7-4D66-A6F7-C3C68A767C07}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40E6CFD8-4203-49CA-A3D7-A93A2344F876}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -76,16 +82,17 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{EA1B5DA0-F263-4298-A8FC-564E9DF00771} = {3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E}
-		{40E6CFD8-4203-49CA-A3D7-A93A2344F876} = {3BC7B60B-4BE3-4D6F-8C03-8D6BDACC845E}
-		{476C0AEB-48CB-4978-9D35-06AA49F800B9} = {3FD0B41F-6CEA-4AE2-832F-60C8686858C4}
-		{009D39C7-821B-44E4-ABB9-8ED94464A5CB} = {3FD0B41F-6CEA-4AE2-832F-60C8686858C4}
-		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
-		{1970A570-2766-49C2-83A4-9898E295D6AF} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
-		{30CC7F8D-60DB-49C5-BE59-81477BFE0376} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
-		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
-		{CABE2B33-0131-4889-AF63-A7241629C96A} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
-		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E} = {2FC8E7CF-2E28-42BB-BCC0-DD0EDF96A483}
+		{EA1B5DA0-F263-4298-A8FC-564E9DF00771} = {A5727164-07A5-48ED-BA4C-0411EB3DF1D0}
+		{5A034C39-5FD7-4D66-A6F7-C3C68A767C07} = {A5727164-07A5-48ED-BA4C-0411EB3DF1D0}
+		{40E6CFD8-4203-49CA-A3D7-A93A2344F876} = {A5727164-07A5-48ED-BA4C-0411EB3DF1D0}
+		{476C0AEB-48CB-4978-9D35-06AA49F800B9} = {6462E107-64BE-4E17-B768-19F8A01C4AAC}
+		{009D39C7-821B-44E4-ABB9-8ED94464A5CB} = {6462E107-64BE-4E17-B768-19F8A01C4AAC}
+		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7} = {9047FE22-6B81-4C91-8222-07A69838D6CF}
+		{30CC7F8D-60DB-49C5-BE59-81477BFE0376} = {9047FE22-6B81-4C91-8222-07A69838D6CF}
+		{1970A570-2766-49C2-83A4-9898E295D6AF} = {9047FE22-6B81-4C91-8222-07A69838D6CF}
+		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6} = {9047FE22-6B81-4C91-8222-07A69838D6CF}
+		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E} = {9047FE22-6B81-4C91-8222-07A69838D6CF}
+		{CABE2B33-0131-4889-AF63-A7241629C96A} = {9047FE22-6B81-4C91-8222-07A69838D6CF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C265A0A-56EF-41A8-B973-AA764175AA29}
diff --git a/src/libraries/NetCoreAppLibrary.props b/src/libraries/NetCoreAppLibrary.props
index cd44cc99317ab9..c407e3af07fa85 100644
--- a/src/libraries/NetCoreAppLibrary.props
+++ b/src/libraries/NetCoreAppLibrary.props
@@ -145,6 +145,19 @@
       System.Xml.XPath;
       System.Xml.XPath.XDocument;
     </NetCoreAppLibrary>
+    <NetCoreAppLibraryPackage>
+      System.Collections.Immutable;
+      System.Diagnostics.DiagnosticSource;
+      System.Formats.Asn1;
+      System.Net.Http.Json;
+      System.Reflection.Metadata;
+      System.Runtime.CompilerServices.Unsafe;
+      System.Text.Encoding.CodePages;
+      System.Text.Encodings.Web;
+      System.Text.Json;
+      System.Threading.Channels;
+      System.Threading.Tasks.Dataflow;
+    </NetCoreAppLibraryPackage>
   </PropertyGroup>
   <!-- Make NetCoreAppLibrary available as an item. -->
   <ItemGroup>
diff --git a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
index cb4ff5afcec6d9..7da3f44a4b87ea 100644
--- a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
+++ b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
@@ -11,13 +11,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{10AB4A2B-7860-4403-A886-37F1505404B4}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj", "{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D561F200-5EE8-46AF-A1B8-537A2A0EFA8F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E90F7EC8-A3A1-42BF-958F-994FE16C103D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{08F7B256-AB13-4784-98C4-737888DC7428}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A355BC66-AB08-42EB-A618-B7FF0049562C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{416AFA87-B3A9-4F0C-822F-BB08F8837609}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{72B65950-8D51-4CA4-8E48-4C055D2FDD36}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,6 +47,10 @@ Global
 		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10AB4A2B-7860-4403-A886-37F1505404B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10AB4A2B-7860-4403-A886-37F1505404B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10AB4A2B-7860-4403-A886-37F1505404B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10AB4A2B-7860-4403-A886-37F1505404B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,13 +64,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B0451507-A304-47CB-B14F-257E44B8AC18} = {D561F200-5EE8-46AF-A1B8-537A2A0EFA8F}
-		{04309507-4EF4-4B93-9C4C-B2B538227C65} = {D561F200-5EE8-46AF-A1B8-537A2A0EFA8F}
-		{531EA13B-CADA-4EBF-840B-4CE996247317} = {08F7B256-AB13-4784-98C4-737888DC7428}
-		{9850C6FD-DC3E-4568-97CC-6B14DF58C232} = {08F7B256-AB13-4784-98C4-737888DC7428}
-		{EDE27BD9-9134-4118-94BD-C9782811684D} = {416AFA87-B3A9-4F0C-822F-BB08F8837609}
-		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8} = {416AFA87-B3A9-4F0C-822F-BB08F8837609}
-		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE} = {416AFA87-B3A9-4F0C-822F-BB08F8837609}
+		{B0451507-A304-47CB-B14F-257E44B8AC18} = {E90F7EC8-A3A1-42BF-958F-994FE16C103D}
+		{04309507-4EF4-4B93-9C4C-B2B538227C65} = {E90F7EC8-A3A1-42BF-958F-994FE16C103D}
+		{531EA13B-CADA-4EBF-840B-4CE996247317} = {A355BC66-AB08-42EB-A618-B7FF0049562C}
+		{10AB4A2B-7860-4403-A886-37F1505404B4} = {A355BC66-AB08-42EB-A618-B7FF0049562C}
+		{9850C6FD-DC3E-4568-97CC-6B14DF58C232} = {A355BC66-AB08-42EB-A618-B7FF0049562C}
+		{EDE27BD9-9134-4118-94BD-C9782811684D} = {72B65950-8D51-4CA4-8E48-4C055D2FDD36}
+		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8} = {72B65950-8D51-4CA4-8E48-4C055D2FDD36}
+		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE} = {72B65950-8D51-4CA4-8E48-4C055D2FDD36}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D222D648-ABA4-4D02-9230-A2B2CC3F3C39}
diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
index e9b3bbaa087fca..1b90d9a8885bf4 100644
--- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
+++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
@@ -5,6 +5,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj", "{26367C54-C1A4-462F-AA71-E48644208AE9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{1A44729F-AFB5-4BB0-8348-58833378AE55}"
@@ -21,6 +23,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{E6DD9860-2824-43D3-BD9D-87ED396B4E46}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\ref\System.Reflection.Metadata.csproj", "{18B78409-3645-48EA-BBB9-C27E5E1DDA27}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DDB26596-113C-471A-91B0-9609C743ACA1}"
@@ -33,11 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{039BB256-1BCF-4398-B586-C05F7C5225C4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A376B9EB-8223-464D-A8F5-0000B26254F4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40BDC801-E491-4FFE-AF15-ECED2D05D80A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED3F0225-44AC-415A-80C8-18D9CAD10A64}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E05F35AD-030D-4D0D-95BD-D97469924CDE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C81302E5-C312-4C10-ACC7-D7201A16FAC6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{24555E1D-07CF-429A-BEC5-5EF3B5A93533}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,42 +56,6 @@ Global
 		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x64.Build.0 = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x86.Build.0 = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x64.ActiveCfg = Release|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x64.Build.0 = Release|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x86.ActiveCfg = Release|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x86.Build.0 = Release|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x64.Build.0 = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x86.Build.0 = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x64.Build.0 = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x86.Build.0 = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x64.ActiveCfg = Release|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x64.Build.0 = Release|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x86.ActiveCfg = Release|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x86.Build.0 = Release|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x64.Build.0 = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x86.Build.0 = Debug|Any CPU
 		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -106,24 +74,42 @@ Global
 		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Checked|x64.Build.0 = Debug|Any CPU
 		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Checked|x86.Build.0 = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Debug|x64.Build.0 = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Debug|x86.Build.0 = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Release|x64.ActiveCfg = Release|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Release|x64.Build.0 = Release|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Release|x86.ActiveCfg = Release|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Release|x86.Build.0 = Release|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Checked|x64.Build.0 = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{63860D71-D351-4285-9154-9864DC883647}.Checked|x86.Build.0 = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x64.Build.0 = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Debug|x86.Build.0 = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x64.ActiveCfg = Release|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x64.Build.0 = Release|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Release|x86.Build.0 = Release|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x64.Build.0 = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x86.Build.0 = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x64.Build.0 = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x64.ActiveCfg = Release|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x64.Build.0 = Release|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Release|x86.Build.0 = Release|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x64.Build.0 = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x86.Build.0 = Debug|Any CPU
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -142,24 +128,6 @@ Global
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Checked|x64.Build.0 = Debug|Any CPU
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Checked|x86.Build.0 = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x64.Build.0 = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x86.Build.0 = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x64.ActiveCfg = Release|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x64.Build.0 = Release|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x86.ActiveCfg = Release|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x86.Build.0 = Release|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x64.Build.0 = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x86.Build.0 = Debug|Any CPU
 		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -178,6 +146,42 @@ Global
 		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Checked|x64.Build.0 = Debug|Any CPU
 		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Checked|x86.Build.0 = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x64.Build.0 = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Debug|x86.Build.0 = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x64.ActiveCfg = Release|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x64.Build.0 = Release|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x86.ActiveCfg = Release|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Release|x86.Build.0 = Release|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x64.Build.0 = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x86.Build.0 = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Debug|x64.Build.0 = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Debug|x86.Build.0 = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Release|x64.ActiveCfg = Release|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Release|x64.Build.0 = Release|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Release|x86.ActiveCfg = Release|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Release|x86.Build.0 = Release|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Checked|x64.Build.0 = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{63860D71-D351-4285-9154-9864DC883647}.Checked|x86.Build.0 = Debug|Any CPU
 		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -196,24 +200,6 @@ Global
 		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x64.Build.0 = Debug|Any CPU
 		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x86.Build.0 = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x64.Build.0 = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x86.Build.0 = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x64.ActiveCfg = Release|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x64.Build.0 = Release|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x86.ActiveCfg = Release|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x86.Build.0 = Release|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x64.Build.0 = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.Build.0 = Debug|Any CPU
 		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -232,6 +218,42 @@ Global
 		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Checked|x64.Build.0 = Debug|Any CPU
 		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Checked|x86.Build.0 = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x64.Build.0 = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Debug|x86.Build.0 = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x64.ActiveCfg = Release|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x64.Build.0 = Release|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x86.ActiveCfg = Release|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Release|x86.Build.0 = Release|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x64.Build.0 = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.Build.0 = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x64.Build.0 = Release|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x86.Build.0 = Release|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x64.Build.0 = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.Build.0 = Debug|Any CPU
 		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -250,24 +272,24 @@ Global
 		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Checked|x64.Build.0 = Debug|Any CPU
 		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Checked|x86.Build.0 = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x64.Build.0 = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x86.Build.0 = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x64.ActiveCfg = Release|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x64.Build.0 = Release|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x86.ActiveCfg = Release|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x86.Build.0 = Release|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x64.Build.0 = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x86.Build.0 = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Release|x64.Build.0 = Release|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Release|x86.Build.0 = Release|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Checked|x64.Build.0 = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD}.Checked|x86.Build.0 = Debug|Any CPU
 		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Debug|Any CPU.Build.0 = Debug|x64
 		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Debug|x64.ActiveCfg = Debug|x64
@@ -286,42 +308,24 @@ Global
 		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Checked|x64.Build.0 = Checked|x64
 		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Checked|x86.ActiveCfg = Checked|x86
 		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Checked|x86.Build.0 = Checked|x86
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x64.Build.0 = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x86.Build.0 = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x64.ActiveCfg = Release|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x64.Build.0 = Release|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x86.ActiveCfg = Release|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x86.Build.0 = Release|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x64.Build.0 = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x86.Build.0 = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x64.Build.0 = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Debug|x86.Build.0 = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x64.ActiveCfg = Release|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x64.Build.0 = Release|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x86.ActiveCfg = Release|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Release|x86.Build.0 = Release|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x64.Build.0 = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.Build.0 = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x64.Build.0 = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Debug|x86.Build.0 = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x64.ActiveCfg = Release|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x64.Build.0 = Release|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Release|x86.Build.0 = Release|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x64.Build.0 = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x86.Build.0 = Debug|Any CPU
 		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -340,6 +344,42 @@ Global
 		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Checked|x64.Build.0 = Debug|Any CPU
 		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Checked|x86.Build.0 = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x64.Build.0 = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Debug|x86.Build.0 = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x64.ActiveCfg = Release|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x64.Build.0 = Release|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Release|x86.Build.0 = Release|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x64.Build.0 = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x86.Build.0 = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Debug|x64.Build.0 = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Debug|x86.Build.0 = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Release|x64.ActiveCfg = Release|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Release|x64.Build.0 = Release|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Release|x86.ActiveCfg = Release|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Release|x86.Build.0 = Release|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Checked|x64.Build.0 = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27}.Checked|x86.Build.0 = Debug|Any CPU
 		{DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -363,23 +403,25 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{956E53A2-5A41-44A7-900A-49044376B2BD} = {A376B9EB-8223-464D-A8F5-0000B26254F4}
-		{63860D71-D351-4285-9154-9864DC883647} = {A376B9EB-8223-464D-A8F5-0000B26254F4}
-		{65FFFD20-CE5D-4FC0-A525-1C308186A16F} = {A376B9EB-8223-464D-A8F5-0000B26254F4}
-		{A8BB1002-C4B3-4B77-9A99-908FC6C84811} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
-		{DDB26596-113C-471A-91B0-9609C743ACA1} = {ED3F0225-44AC-415A-80C8-18D9CAD10A64}
-		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{26367C54-C1A4-462F-AA71-E48644208AE9} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{623D46A5-8ED4-43CF-A01B-528F0A505090} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{1A44729F-AFB5-4BB0-8348-58833378AE55} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{96501106-36D0-4093-8FEE-AF90713D09ED} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E34F351F-8EB7-4D44-BA44-85F791F662CC} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{039BB256-1BCF-4398-B586-C05F7C5225C4} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
-		{E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {C81302E5-C312-4C10-ACC7-D7201A16FAC6}
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{26367C54-C1A4-462F-AA71-E48644208AE9} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{623D46A5-8ED4-43CF-A01B-528F0A505090} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{1A44729F-AFB5-4BB0-8348-58833378AE55} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{96501106-36D0-4093-8FEE-AF90713D09ED} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{039BB256-1BCF-4398-B586-C05F7C5225C4} = {40BDC801-E491-4FFE-AF15-ECED2D05D80A}
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811} = {E05F35AD-030D-4D0D-95BD-D97469924CDE}
+		{47D972C9-471B-4E87-BFF9-A9F8D1BB28CD} = {E05F35AD-030D-4D0D-95BD-D97469924CDE}
+		{18B78409-3645-48EA-BBB9-C27E5E1DDA27} = {E05F35AD-030D-4D0D-95BD-D97469924CDE}
+		{DDB26596-113C-471A-91B0-9609C743ACA1} = {E05F35AD-030D-4D0D-95BD-D97469924CDE}
+		{956E53A2-5A41-44A7-900A-49044376B2BD} = {24555E1D-07CF-429A-BEC5-5EF3B5A93533}
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F} = {24555E1D-07CF-429A-BEC5-5EF3B5A93533}
+		{63860D71-D351-4285-9154-9864DC883647} = {24555E1D-07CF-429A-BEC5-5EF3B5A93533}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1572B987-E4D6-45D5-82AB-9CC0BB306C2E}
diff --git a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
index 722dd754f03c24..c3525339300f72 100644
--- a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
+++ b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F94DE827-A426-45CB-AE6E-4E1C154B5386}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{2EED1B31-0C62-4B49-88FF-546ABA699A41}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "ref\System.Formats.Asn1.csproj", "{1548AC5C-27FD-4B46-A930-C168D622FAB0}"
@@ -9,17 +11,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "src\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1.Tests", "tests\System.Formats.Asn1.Tests.csproj", "{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\ref\System.Reflection.Metadata.csproj", "{0FFAFF78-5C0F-4B03-A04E-0812199D3439}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5280823-9A9A-4314-B0C3-B983A7D50C85}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5690A39F-8BCB-4B98-B230-8734FABEF393}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D2D75960-C965-4D11-8C71-292973DF20CC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F35AB8E-9248-47A1-B863-92F9610F4210}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61790DBD-EAF7-4855-99C4-64FD3FD9E5FE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4ABC26D2-F00E-473B-8672-7903F992C406}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,14 +35,14 @@ Global
 		{1548AC5C-27FD-4B46-A930-C168D622FAB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1548AC5C-27FD-4B46-A930-C168D622FAB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1548AC5C-27FD-4B46-A930-C168D622FAB0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A078A4EB-27E8-42B1-BD44-3807732A4560}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F94DE827-A426-45CB-AE6E-4E1C154B5386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F94DE827-A426-45CB-AE6E-4E1C154B5386}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F94DE827-A426-45CB-AE6E-4E1C154B5386}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -51,6 +55,10 @@ Global
 		{E5280823-9A9A-4314-B0C3-B983A7D50C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5280823-9A9A-4314-B0C3-B983A7D50C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5280823-9A9A-4314-B0C3-B983A7D50C85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FFAFF78-5C0F-4B03-A04E-0812199D3439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FFAFF78-5C0F-4B03-A04E-0812199D3439}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FFAFF78-5C0F-4B03-A04E-0812199D3439}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FFAFF78-5C0F-4B03-A04E-0812199D3439}.Release|Any CPU.Build.0 = Release|Any CPU
 		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,19 +67,25 @@ Global
 		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EED1B31-0C62-4B49-88FF-546ABA699A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EED1B31-0C62-4B49-88FF-546ABA699A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EED1B31-0C62-4B49-88FF-546ABA699A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2EED1B31-0C62-4B49-88FF-546ABA699A41}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1548AC5C-27FD-4B46-A930-C168D622FAB0} = {5690A39F-8BCB-4B98-B230-8734FABEF393}
-		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9} = {5690A39F-8BCB-4B98-B230-8734FABEF393}
-		{A078A4EB-27E8-42B1-BD44-3807732A4560} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
-		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
-		{E5280823-9A9A-4314-B0C3-B983A7D50C85} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
-		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22} = {7D4FCCCB-BD58-4ABE-A98D-140A5B303DF6}
-		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294} = {61790DBD-EAF7-4855-99C4-64FD3FD9E5FE}
-		{F94DE827-A426-45CB-AE6E-4E1C154B5386} = {61790DBD-EAF7-4855-99C4-64FD3FD9E5FE}
+		{1548AC5C-27FD-4B46-A930-C168D622FAB0} = {D2D75960-C965-4D11-8C71-292973DF20CC}
+		{0FFAFF78-5C0F-4B03-A04E-0812199D3439} = {D2D75960-C965-4D11-8C71-292973DF20CC}
+		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9} = {D2D75960-C965-4D11-8C71-292973DF20CC}
+		{2EED1B31-0C62-4B49-88FF-546ABA699A41} = {D2D75960-C965-4D11-8C71-292973DF20CC}
+		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294} = {3F35AB8E-9248-47A1-B863-92F9610F4210}
+		{F94DE827-A426-45CB-AE6E-4E1C154B5386} = {3F35AB8E-9248-47A1-B863-92F9610F4210}
+		{A078A4EB-27E8-42B1-BD44-3807732A4560} = {4ABC26D2-F00E-473B-8672-7903F992C406}
+		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F} = {4ABC26D2-F00E-473B-8672-7903F992C406}
+		{E5280823-9A9A-4314-B0C3-B983A7D50C85} = {4ABC26D2-F00E-473B-8672-7903F992C406}
+		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22} = {4ABC26D2-F00E-473B-8672-7903F992C406}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4DF081FC-DC0D-4317-AB2C-4294B9FE6257}
diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln
index 567a6792d07c34..7a8f8dd5dc011d 100644
--- a/src/libraries/System.IO.Ports/System.IO.Ports.sln
+++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln
@@ -11,13 +11,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7E68AD2F-437D-47A3-A68C-1286B995B33D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{EFA30110-AEEF-4B50-ADF7-32278ECECE17}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj", "{50120440-409D-4B8A-B54C-F5FC637EF529}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F3F3FD18-CF31-4E24-9BBD-5303D38CF86B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9E197803-31CA-4A5C-9C34-4DBDCADDADF7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{88B0C0E7-B79E-4DFD-9A65-C3F506507924}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E846C176-82C0-40DB-B95E-4A3C268AC2DD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5326A44-B098-41AB-8EEC-0492DC64E610}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{174684F9-F688-4396-BEE4-0540649ECA54}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,30 +27,34 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5594242D-5209-4F6F-AA08-44489B5B733F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5594242D-5209-4F6F-AA08-44489B5B733F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5594242D-5209-4F6F-AA08-44489B5B733F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5594242D-5209-4F6F-AA08-44489B5B733F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{32AD9913-7FC8-499A-9712-A5128998BFDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{32AD9913-7FC8-499A-9712-A5128998BFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{32AD9913-7FC8-499A-9712-A5128998BFDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{32AD9913-7FC8-499A-9712-A5128998BFDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5594242D-5209-4F6F-AA08-44489B5B733F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5594242D-5209-4F6F-AA08-44489B5B733F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5594242D-5209-4F6F-AA08-44489B5B733F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5594242D-5209-4F6F-AA08-44489B5B733F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50120440-409D-4B8A-B54C-F5FC637EF529}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50120440-409D-4B8A-B54C-F5FC637EF529}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50120440-409D-4B8A-B54C-F5FC637EF529}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50120440-409D-4B8A-B54C-F5FC637EF529}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E68AD2F-437D-47A3-A68C-1286B995B33D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFA30110-AEEF-4B50-ADF7-32278ECECE17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFA30110-AEEF-4B50-ADF7-32278ECECE17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFA30110-AEEF-4B50-ADF7-32278ECECE17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFA30110-AEEF-4B50-ADF7-32278ECECE17}.Release|Any CPU.Build.0 = Release|Any CPU
 		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -58,13 +64,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B}
-		{7E68AD2F-437D-47A3-A68C-1286B995B33D} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B}
-		{50120440-409D-4B8A-B54C-F5FC637EF529} = {F3F3FD18-CF31-4E24-9BBD-5303D38CF86B}
-		{5594242D-5209-4F6F-AA08-44489B5B733F} = {88B0C0E7-B79E-4DFD-9A65-C3F506507924}
-		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8} = {88B0C0E7-B79E-4DFD-9A65-C3F506507924}
-		{32AD9913-7FC8-499A-9712-A5128998BFDA} = {D5326A44-B098-41AB-8EEC-0492DC64E610}
-		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7} = {D5326A44-B098-41AB-8EEC-0492DC64E610}
+		{32AD9913-7FC8-499A-9712-A5128998BFDA} = {9E197803-31CA-4A5C-9C34-4DBDCADDADF7}
+		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7} = {9E197803-31CA-4A5C-9C34-4DBDCADDADF7}
+		{5594242D-5209-4F6F-AA08-44489B5B733F} = {E846C176-82C0-40DB-B95E-4A3C268AC2DD}
+		{EFA30110-AEEF-4B50-ADF7-32278ECECE17} = {E846C176-82C0-40DB-B95E-4A3C268AC2DD}
+		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8} = {E846C176-82C0-40DB-B95E-4A3C268AC2DD}
+		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E} = {174684F9-F688-4396-BEE4-0540649ECA54}
+		{50120440-409D-4B8A-B54C-F5FC637EF529} = {174684F9-F688-4396-BEE4-0540649ECA54}
+		{7E68AD2F-437D-47A3-A68C-1286B995B33D} = {174684F9-F688-4396-BEE4-0540649ECA54}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {54136FEA-7C5B-41E5-86EE-C5816F222DEE}
diff --git a/src/libraries/System.Memory.Data/System.Memory.Data.sln b/src/libraries/System.Memory.Data/System.Memory.Data.sln
index 5878d08ab4271f..49b11b5271b099 100644
--- a/src/libraries/System.Memory.Data/System.Memory.Data.sln
+++ b/src/libraries/System.Memory.Data/System.Memory.Data.sln
@@ -15,17 +15,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E17B915A-81CA-44D8-818E-512B65609475}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{A096CE56-04A5-4927-AC4D-4F516F0AFAA4}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{9F2EC2C8-6E28-404A-8087-7A0518624EC6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{9C6BDDF5-8ACA-4F75-8589-3DAA4C98D15A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{6A2B5C68-14C3-4989-8530-D51A138C72AE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2BD73108-47D7-40E6-BFCB-169E6AD42A81}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B7015B27-5EB0-4EE4-8AD6-2FFB7E33ED19}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6AF8CEE-6550-4190-97D4-D51C5B114919}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5C94DF48-3D6F-4061-9E24-0772F2431226}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0DFFF5D-56E1-4E5E-9286-5233CD730241}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,14 +49,18 @@ Global
 		{ACDB56AF-7B9F-4762-9764-D6FF09118D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ACDB56AF-7B9F-4762-9764-D6FF09118D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACDB56AF-7B9F-4762-9764-D6FF09118D09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C6BDDF5-8ACA-4F75-8589-3DAA4C98D15A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C6BDDF5-8ACA-4F75-8589-3DAA4C98D15A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C6BDDF5-8ACA-4F75-8589-3DAA4C98D15A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C6BDDF5-8ACA-4F75-8589-3DAA4C98D15A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73EE06DD-772E-44E9-9B91-A9AF081C2BEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A2B5C68-14C3-4989-8530-D51A138C72AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A2B5C68-14C3-4989-8530-D51A138C72AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A2B5C68-14C3-4989-8530-D51A138C72AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -65,14 +73,18 @@ Global
 		{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A096CE56-04A5-4927-AC4D-4F516F0AFAA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A096CE56-04A5-4927-AC4D-4F516F0AFAA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A096CE56-04A5-4927-AC4D-4F516F0AFAA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A096CE56-04A5-4927-AC4D-4F516F0AFAA4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F2EC2C8-6E28-404A-8087-7A0518624EC6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,17 +94,19 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{804B5D44-05A3-491E-A6AB-35C592E6703E} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81}
-		{73EE06DD-772E-44E9-9B91-A9AF081C2BEB} = {2BD73108-47D7-40E6-BFCB-169E6AD42A81}
-		{ACB7E0BF-015F-43DC-A2F5-85506173B223} = {E6AF8CEE-6550-4190-97D4-D51C5B114919}
-		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B} = {E6AF8CEE-6550-4190-97D4-D51C5B114919}
-		{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66} = {E6AF8CEE-6550-4190-97D4-D51C5B114919}
-		{ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
-		{6A2B5C68-14C3-4989-8530-D51A138C72AE} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
-		{E17B915A-81CA-44D8-818E-512B65609475} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
-		{9F2EC2C8-6E28-404A-8087-7A0518624EC6} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
-		{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
-		{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43} = {D908DCBE-EFA4-4CCA-9A1C-AEB48D59C504}
+		{804B5D44-05A3-491E-A6AB-35C592E6703E} = {B7015B27-5EB0-4EE4-8AD6-2FFB7E33ED19}
+		{73EE06DD-772E-44E9-9B91-A9AF081C2BEB} = {B7015B27-5EB0-4EE4-8AD6-2FFB7E33ED19}
+		{ACB7E0BF-015F-43DC-A2F5-85506173B223} = {5C94DF48-3D6F-4061-9E24-0772F2431226}
+		{9C6BDDF5-8ACA-4F75-8589-3DAA4C98D15A} = {5C94DF48-3D6F-4061-9E24-0772F2431226}
+		{B7504AAC-38DA-461A-BE19-1973DA8CBA5B} = {5C94DF48-3D6F-4061-9E24-0772F2431226}
+		{B9162F6C-4CD1-4D33-BA4A-42830A1B1C66} = {5C94DF48-3D6F-4061-9E24-0772F2431226}
+		{A096CE56-04A5-4927-AC4D-4F516F0AFAA4} = {5C94DF48-3D6F-4061-9E24-0772F2431226}
+		{ACDB56AF-7B9F-4762-9764-D6FF09118D09} = {A0DFFF5D-56E1-4E5E-9286-5233CD730241}
+		{6A2B5C68-14C3-4989-8530-D51A138C72AE} = {A0DFFF5D-56E1-4E5E-9286-5233CD730241}
+		{E17B915A-81CA-44D8-818E-512B65609475} = {A0DFFF5D-56E1-4E5E-9286-5233CD730241}
+		{0DE5E7DA-0AE0-4CF2-95AB-1E476FD68C5C} = {A0DFFF5D-56E1-4E5E-9286-5233CD730241}
+		{9F2EC2C8-6E28-404A-8087-7A0518624EC6} = {A0DFFF5D-56E1-4E5E-9286-5233CD730241}
+		{1D866ECD-FD46-4FCA-9408-D1E3E9CB1F43} = {A0DFFF5D-56E1-4E5E-9286-5233CD730241}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {01DAF96B-AF8E-4576-A1BC-57D19BDB317E}
diff --git a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
index e7575d6b03568b..745f50300747f9 100644
--- a/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
+++ b/src/libraries/System.Net.Http.Json/System.Net.Http.Json.sln
@@ -5,6 +5,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{265CD8FB-34C2-4A00-B51D-0174F061DC79}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "ref\System.Net.Http.Json.csproj", "{2F4E0ED7-19C4-4280-87EF-C32C155815F3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "src\System.Net.Http.Json.csproj", "{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E}"
@@ -19,17 +21,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{C35F7DA7-5D3F-42E4-9C7A-13514967D8FD}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{A3A4E151-09BD-489E-B063-B67FF302275C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{BC7D3412-DBCB-4863-8BF8-41899E32608C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{945B0700-C720-4775-B9E4-6A27DAA90190}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{15ACF0B2-60BA-408B-818E-86354ACB4BE3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A75027EA-199E-4C86-A636-AE9AE0F0756C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A66925D-3658-46BE-A730-5BF70D8D5B90}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,10 +43,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5F445FD-335C-418D-A46F-D62AE59333FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5F445FD-335C-418D-A46F-D62AE59333FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5F445FD-335C-418D-A46F-D62AE59333FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,14 +55,18 @@ Global
 		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F4E0ED7-19C4-4280-87EF-C32C155815F3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -69,44 +75,59 @@ Global
 		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E75F701-4A14-4372-894E-F61B75026A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E75F701-4A14-4372-894E-F61B75026A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E75F701-4A14-4372-894E-F61B75026A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E75F701-4A14-4372-894E-F61B75026A96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3A4E151-09BD-489E-B063-B67FF302275C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3A4E151-09BD-489E-B063-B67FF302275C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3A4E151-09BD-489E-B063-B67FF302275C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3A4E151-09BD-489E-B063-B67FF302275C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E75F701-4A14-4372-894E-F61B75026A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E75F701-4A14-4372-894E-F61B75026A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E75F701-4A14-4372-894E-F61B75026A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E75F701-4A14-4372-894E-F61B75026A96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C35F7DA7-5D3F-42E4-9C7A-13514967D8FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C35F7DA7-5D3F-42E4-9C7A-13514967D8FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C35F7DA7-5D3F-42E4-9C7A-13514967D8FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C35F7DA7-5D3F-42E4-9C7A-13514967D8FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{265CD8FB-34C2-4A00-B51D-0174F061DC79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{265CD8FB-34C2-4A00-B51D-0174F061DC79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{265CD8FB-34C2-4A00-B51D-0174F061DC79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{265CD8FB-34C2-4A00-B51D-0174F061DC79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2F4E0ED7-19C4-4280-87EF-C32C155815F3} = {945B0700-C720-4775-B9E4-6A27DAA90190}
-		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D} = {945B0700-C720-4775-B9E4-6A27DAA90190}
-		{6E75F701-4A14-4372-894E-F61B75026A96} = {945B0700-C720-4775-B9E4-6A27DAA90190}
-		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22} = {945B0700-C720-4775-B9E4-6A27DAA90190}
-		{E5F445FD-335C-418D-A46F-D62AE59333FC} = {A75027EA-199E-4C86-A636-AE9AE0F0756C}
-		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D} = {A75027EA-199E-4C86-A636-AE9AE0F0756C}
-		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27} = {A75027EA-199E-4C86-A636-AE9AE0F0756C}
-		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
-		{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
-		{BC7D3412-DBCB-4863-8BF8-41899E32608C} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
-		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
-		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
-		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {2A66925D-3658-46BE-A730-5BF70D8D5B90}
+		{E5F445FD-335C-418D-A46F-D62AE59333FC} = {15ACF0B2-60BA-408B-818E-86354ACB4BE3}
+		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D} = {15ACF0B2-60BA-408B-818E-86354ACB4BE3}
+		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27} = {15ACF0B2-60BA-408B-818E-86354ACB4BE3}
+		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}
+		{D120D5A7-69D9-44A2-B7F7-EE0E48CC0238} = {CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}
+		{BC7D3412-DBCB-4863-8BF8-41899E32608C} = {CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}
+		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1} = {CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}
+		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}
+		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {CEBD02AA-41E2-49E9-951D-C7D8D17F64F4}
+		{2F4E0ED7-19C4-4280-87EF-C32C155815F3} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
+		{A3A4E151-09BD-489E-B063-B67FF302275C} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
+		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
+		{6E75F701-4A14-4372-894E-F61B75026A96} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
+		{C35F7DA7-5D3F-42E4-9C7A-13514967D8FD} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
+		{265CD8FB-34C2-4A00-B51D-0174F061DC79} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
+		{65CF8B8B-794A-4523-A2E7-BBDD24D9DC1D} = {ADDEFA7F-0D48-4243-A7F6-CE2F4D3F22B3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A121E5BA-D935-4572-8D67-2F15DF29922B}
diff --git a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
index d6d95c23aa12a0..44b5d02f09c45b 100644
--- a/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
+++ b/src/libraries/System.Net.Http.WinHttpHandler/System.Net.Http.WinHttpHandler.sln
@@ -5,10 +5,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{A112B6C7-DEA5-4605-99AA-883348A79076}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\ref\System.DirectoryServices.Protocols.csproj", "{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{7EF13CC5-C714-4C0F-990F-C0884B92A9A1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "..\System.Net.Http.Json\ref\System.Net.Http.Json.csproj", "{D831B4DC-6A5F-4ADD-94BF-C64A8D1312F6}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "..\System.Net.Http.Json\src\System.Net.Http.Json.csproj", "{E6A8B90B-69CD-4B0D-8A33-F208A3169674}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler", "ref\System.Net.Http.WinHttpHandler.csproj", "{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522}"
@@ -25,17 +29,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{28C24BF8-8E08-485F-8EEE-817EB847774C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{A35A5180-1043-4C02-8D6E-1437E136C774}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{BACC5257-6CA8-45C7-970F-C8D501DA59AB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "..\System.Text.Json\gen\System.Text.Json.SourceGeneration.csproj", "{302F00AD-85F1-4DE9-B100-41F8EAB93B7C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{CA9704D5-664A-448A-9230-C689D2E13725}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\src\System.Text.Json.csproj", "{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F9A243D-B060-4BB2-A9E1-A9CB861328D9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1189C63C-7A25-45A2-BA79-AC558CF3016B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49E09973-383D-4AD6-9D88-B93A02031607}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AB70BB9C-3C04-4D81-9077-FECC24EE7846}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C66589E-2DB3-4635-BADA-9B6452327239}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2FE7478D-F303-493B-824E-B6F2F71E2FED}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,6 +51,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -51,18 +67,10 @@ Global
 		{DE2A69CC-4962-4BF6-A714-41A87A6C045B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE2A69CC-4962-4BF6-A714-41A87A6C045B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE2A69CC-4962-4BF6-A714-41A87A6C045B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{090BA6CA-F661-4BDE-9663-65F8231DDB1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Release|Any CPU.Build.0 = Release|Any CPU
 		{49FC63FA-3E81-4335-91CF-B5056E007343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{49FC63FA-3E81-4335-91CF-B5056E007343}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49FC63FA-3E81-4335-91CF-B5056E007343}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71,18 +79,22 @@ Global
 		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6A8B90B-69CD-4B0D-8A33-F208A3169674}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28C24BF8-8E08-485F-8EEE-817EB847774C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F406CD45-4516-4DC3-AC4D-1B61835D3B71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A112B6C7-DEA5-4605-99AA-883348A79076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A112B6C7-DEA5-4605-99AA-883348A79076}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A112B6C7-DEA5-4605-99AA-883348A79076}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A112B6C7-DEA5-4605-99AA-883348A79076}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D831B4DC-6A5F-4ADD-94BF-C64A8D1312F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D831B4DC-6A5F-4ADD-94BF-C64A8D1312F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D831B4DC-6A5F-4ADD-94BF-C64A8D1312F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D831B4DC-6A5F-4ADD-94BF-C64A8D1312F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,14 +103,22 @@ Global
 		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2311DD8-2E5E-4DD7-840F-237A8F77A311}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA9704D5-664A-448A-9230-C689D2E13725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA9704D5-664A-448A-9230-C689D2E13725}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA9704D5-664A-448A-9230-C689D2E13725}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA9704D5-664A-448A-9230-C689D2E13725}.Release|Any CPU.Build.0 = Release|Any CPU
 		{302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{302F00AD-85F1-4DE9-B100-41F8EAB93B7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BACC5257-6CA8-45C7-970F-C8D501DA59AB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -107,27 +127,35 @@ Global
 		{D18082CB-C337-473B-8AC3-5FCC312F90C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D18082CB-C337-473B-8AC3-5FCC312F90C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D18082CB-C337-473B-8AC3-5FCC312F90C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A35A5180-1043-4C02-8D6E-1437E136C774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A35A5180-1043-4C02-8D6E-1437E136C774}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A35A5180-1043-4C02-8D6E-1437E136C774}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A35A5180-1043-4C02-8D6E-1437E136C774}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9}
-		{F406CD45-4516-4DC3-AC4D-1B61835D3B71} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9}
-		{E2311DD8-2E5E-4DD7-840F-237A8F77A311} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9}
-		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9}
-		{D18082CB-C337-473B-8AC3-5FCC312F90C6} = {2F9A243D-B060-4BB2-A9E1-A9CB861328D9}
-		{DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{28C24BF8-8E08-485F-8EEE-817EB847774C} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{302F00AD-85F1-4DE9-B100-41F8EAB93B7C} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {49E09973-383D-4AD6-9D88-B93A02031607}
-		{090BA6CA-F661-4BDE-9663-65F8231DDB1D} = {6C66589E-2DB3-4635-BADA-9B6452327239}
-		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3} = {6C66589E-2DB3-4635-BADA-9B6452327239}
-		{49FC63FA-3E81-4335-91CF-B5056E007343} = {6C66589E-2DB3-4635-BADA-9B6452327239}
+		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3} = {1189C63C-7A25-45A2-BA79-AC558CF3016B}
+		{090BA6CA-F661-4BDE-9663-65F8231DDB1D} = {1189C63C-7A25-45A2-BA79-AC558CF3016B}
+		{49FC63FA-3E81-4335-91CF-B5056E007343} = {1189C63C-7A25-45A2-BA79-AC558CF3016B}
+		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{F406CD45-4516-4DC3-AC4D-1B61835D3B71} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{A112B6C7-DEA5-4605-99AA-883348A79076} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{D831B4DC-6A5F-4ADD-94BF-C64A8D1312F6} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{E2311DD8-2E5E-4DD7-840F-237A8F77A311} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{CA9704D5-664A-448A-9230-C689D2E13725} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{D18082CB-C337-473B-8AC3-5FCC312F90C6} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{A35A5180-1043-4C02-8D6E-1437E136C774} = {AB70BB9C-3C04-4D81-9077-FECC24EE7846}
+		{DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{28C24BF8-8E08-485F-8EEE-817EB847774C} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{302F00AD-85F1-4DE9-B100-41F8EAB93B7C} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
+		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {2FE7478D-F303-493B-824E-B6F2F71E2FED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F5BAF3DD-D05C-4DCC-BB36-16645CA1F151}
diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln
index ae5963d0d5ba87..25484652398b21 100644
--- a/src/libraries/System.Net.Http/System.Net.Http.sln
+++ b/src/libraries/System.Net.Http/System.Net.Http.sln
@@ -3,10 +3,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "..\System.Diagnostics.DiagnosticSource\ref\System.Diagnostics.DiagnosticSource.csproj", "{02D84A07-59A1-4BDD-AEDD-6C7162A12CD9}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\ref\System.DirectoryServices.Protocols.csproj", "{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{7AF8335D-0EC5-49B2-B1CF-6CA361501C0C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http", "ref\System.Net.Http.csproj", "{CB685EA0-3A2C-4966-82EF-F04D0C02A419}"
@@ -33,11 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FB2C7B77-5833-486D-8839-50D80D7C887A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1CA55587-BEBD-4AB6-A5E7-E17B051701D2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{145B4B2E-5EF8-46F2-A596-E1043BB22873}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C5754C5D-38BF-4E7E-8297-1FEC397E40AB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -53,6 +57,10 @@ Global
 		{51412712-224A-4F69-9964-3EFBEB2AA3E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{51412712-224A-4F69-9964-3EFBEB2AA3E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{51412712-224A-4F69-9964-3EFBEB2AA3E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC7EE3FF-B352-442D-AB17-E0055121B918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC7EE3FF-B352-442D-AB17-E0055121B918}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC7EE3FF-B352-442D-AB17-E0055121B918}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,10 +69,6 @@ Global
 		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -73,42 +77,50 @@ Global
 		{84E90EDE-19CD-460D-A2E8-71D9D726C56C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84E90EDE-19CD-460D-A2E8-71D9D726C56C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84E90EDE-19CD-460D-A2E8-71D9D726C56C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02D84A07-59A1-4BDD-AEDD-6C7162A12CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02D84A07-59A1-4BDD-AEDD-6C7162A12CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02D84A07-59A1-4BDD-AEDD-6C7162A12CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02D84A07-59A1-4BDD-AEDD-6C7162A12CD9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{819DB839-291D-4128-A2D8-719340A7DEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{819DB839-291D-4128-A2D8-719340A7DEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{819DB839-291D-4128-A2D8-719340A7DEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{819DB839-291D-4128-A2D8-719340A7DEBF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{819DB839-291D-4128-A2D8-719340A7DEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{819DB839-291D-4128-A2D8-719340A7DEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{819DB839-291D-4128-A2D8-719340A7DEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{819DB839-291D-4128-A2D8-719340A7DEBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ACDD8D8E-6945-41BC-87BD-1BD225653521}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACDD8D8E-6945-41BC-87BD-1BD225653521}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ACDD8D8E-6945-41BC-87BD-1BD225653521}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACDD8D8E-6945-41BC-87BD-1BD225653521}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AF8335D-0EC5-49B2-B1CF-6CA361501C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AF8335D-0EC5-49B2-B1CF-6CA361501C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AF8335D-0EC5-49B2-B1CF-6CA361501C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AF8335D-0EC5-49B2-B1CF-6CA361501C0C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -118,23 +130,25 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{CB685EA0-3A2C-4966-82EF-F04D0C02A419} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
-		{84E90EDE-19CD-460D-A2E8-71D9D726C56C} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
-		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
-		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35} = {3F6352E6-73F1-4E69-A3AD-7E9E7F9051AD}
-		{51412712-224A-4F69-9964-3EFBEB2AA3E0} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}
-		{FC7EE3FF-B352-442D-AB17-E0055121B918} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}
-		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}
-		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}
-		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8} = {0656F36C-F261-4F5A-B3E1-2DBB9FA6CF10}
-		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{819DB839-291D-4128-A2D8-719340A7DEBF} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{ACDD8D8E-6945-41BC-87BD-1BD225653521} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
-		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C} = {145B4B2E-5EF8-46F2-A596-E1043BB22873}
+		{CB685EA0-3A2C-4966-82EF-F04D0C02A419} = {FB2C7B77-5833-486D-8839-50D80D7C887A}
+		{84E90EDE-19CD-460D-A2E8-71D9D726C56C} = {FB2C7B77-5833-486D-8839-50D80D7C887A}
+		{02D84A07-59A1-4BDD-AEDD-6C7162A12CD9} = {FB2C7B77-5833-486D-8839-50D80D7C887A}
+		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1} = {FB2C7B77-5833-486D-8839-50D80D7C887A}
+		{7AF8335D-0EC5-49B2-B1CF-6CA361501C0C} = {FB2C7B77-5833-486D-8839-50D80D7C887A}
+		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35} = {FB2C7B77-5833-486D-8839-50D80D7C887A}
+		{51412712-224A-4F69-9964-3EFBEB2AA3E0} = {1CA55587-BEBD-4AB6-A5E7-E17B051701D2}
+		{FC7EE3FF-B352-442D-AB17-E0055121B918} = {1CA55587-BEBD-4AB6-A5E7-E17B051701D2}
+		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2} = {1CA55587-BEBD-4AB6-A5E7-E17B051701D2}
+		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85} = {1CA55587-BEBD-4AB6-A5E7-E17B051701D2}
+		{079F7C1B-0364-4EAB-93F7-049C2ECB99E8} = {1CA55587-BEBD-4AB6-A5E7-E17B051701D2}
+		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{F1FFB6F5-628E-4DF5-8FD0-9ADFB9EF5E91} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{819DB839-291D-4128-A2D8-719340A7DEBF} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{ACDD8D8E-6945-41BC-87BD-1BD225653521} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
+		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C} = {C5754C5D-38BF-4E7E-8297-1FEC397E40AB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F1EF65A2-61B3-45A3-9CDE-BD62218BE447}
diff --git a/src/libraries/System.Net.Quic/System.Net.Quic.sln b/src/libraries/System.Net.Quic/System.Net.Quic.sln
index efc68c649d35fe..9f048b43939a59 100644
--- a/src/libraries/System.Net.Quic/System.Net.Quic.sln
+++ b/src/libraries/System.Net.Quic/System.Net.Quic.sln
@@ -3,6 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{55C933AA-2735-4B38-A1DD-01A27467AB18}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{FD8C03E4-6236-4435-A968-FBFEEAFD8F9E}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "ref\System.Net.Quic.csproj", "{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}"
@@ -17,11 +19,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{538F3900-95BF-423D-9912-F94B0ECE463C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{167BFB78-A26B-4E79-A97F-0FBB42C51C79}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{12C4206E-D19B-44BF-8002-6236D65AAE1B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{284132A6-65DF-4C5A-8A80-94DB233EB20C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EF7F530-1F45-48CE-AA30-30FFD83147B9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{189AE207-8A50-47C6-9BB7-262180C4F43E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,6 +31,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -37,48 +43,49 @@ Global
 		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55C933AA-2735-4B38-A1DD-01A27467AB18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD8C03E4-6236-4435-A968-FBFEEAFD8F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD8C03E4-6236-4435-A968-FBFEEAFD8F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD8C03E4-6236-4435-A968-FBFEEAFD8F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD8C03E4-6236-4435-A968-FBFEEAFD8F9E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5} = {538F3900-95BF-423D-9912-F94B0ECE463C}
-		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8} = {538F3900-95BF-423D-9912-F94B0ECE463C}
-		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038} = {12C4206E-D19B-44BF-8002-6236D65AAE1B}
-		{55C933AA-2735-4B38-A1DD-01A27467AB18} = {12C4206E-D19B-44BF-8002-6236D65AAE1B}
-		{D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6} = {12C4206E-D19B-44BF-8002-6236D65AAE1B}
-		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9}
-		{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9}
-		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9}
-		{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241} = {8EF7F530-1F45-48CE-AA30-30FFD83147B9}
+		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7} = {167BFB78-A26B-4E79-A97F-0FBB42C51C79}
+		{23C03FB6-C11D-4F42-AD6C-66CAE2A8175A} = {167BFB78-A26B-4E79-A97F-0FBB42C51C79}
+		{BF401CDC-5AED-4F3E-8C3F-96D8DFA7E241} = {167BFB78-A26B-4E79-A97F-0FBB42C51C79}
+		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0} = {167BFB78-A26B-4E79-A97F-0FBB42C51C79}
+		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5} = {284132A6-65DF-4C5A-8A80-94DB233EB20C}
+		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8} = {284132A6-65DF-4C5A-8A80-94DB233EB20C}
+		{FD8C03E4-6236-4435-A968-FBFEEAFD8F9E} = {284132A6-65DF-4C5A-8A80-94DB233EB20C}
+		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038} = {189AE207-8A50-47C6-9BB7-262180C4F43E}
+		{D5EDF0C3-7574-4A08-B78F-AEAA2DEE0BD6} = {189AE207-8A50-47C6-9BB7-262180C4F43E}
+		{55C933AA-2735-4B38-A1DD-01A27467AB18} = {189AE207-8A50-47C6-9BB7-262180C4F43E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4B59ACCA-7F0C-4062-AA79-B3D75EFACCCD}
diff --git a/src/libraries/System.Net.Security/System.Net.Security.sln b/src/libraries/System.Net.Security/System.Net.Security.sln
index 14d0dda4a2acc8..17ddbaa7e60079 100644
--- a/src/libraries/System.Net.Security/System.Net.Security.sln
+++ b/src/libraries/System.Net.Security/System.Net.Security.sln
@@ -3,6 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", ".
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{16B2F746-485C-4A15-883E-ABF2C885DD2A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{ADE6745E-EC81-4D08-9F78-026080EB1119}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{441D4079-55B4-4C47-A0E5-1330DC9A31CB}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security", "ref\System.Net.Security.csproj", "{97493212-ADF3-46AF-8669-F038964CDA22}"
@@ -23,11 +25,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4993DA3B-E035-45CA-A87C-C2A4A1E8B55B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{19C079E3-367B-480E-A46E-8D56D47F94EA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{361E82BC-8FD2-45DF-986C-D7EE8F9A0709}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70E29C1C-AC9B-4E71-AB74-9906EF973EBF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A6B58E5-C830-4307-94A8-20081E6670F4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,18 +37,18 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{97493212-ADF3-46AF-8669-F038964CDA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{97493212-ADF3-46AF-8669-F038964CDA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{97493212-ADF3-46AF-8669-F038964CDA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97493212-ADF3-46AF-8669-F038964CDA22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,10 +61,6 @@ Global
 		{16B2F746-485C-4A15-883E-ABF2C885DD2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16B2F746-485C-4A15-883E-ABF2C885DD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16B2F746-485C-4A15-883E-ABF2C885DD2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A5732F4-1562-4E5A-B2FF-E294ABC5EEFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A5732F4-1562-4E5A-B2FF-E294ABC5EEFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A5732F4-1562-4E5A-B2FF-E294ABC5EEFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -71,6 +69,10 @@ Global
 		{E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{441D4079-55B4-4C47-A0E5-1330DC9A31CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -79,6 +81,10 @@ Global
 		{754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADE6745E-EC81-4D08-9F78-026080EB1119}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADE6745E-EC81-4D08-9F78-026080EB1119}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADE6745E-EC81-4D08-9F78-026080EB1119}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADE6745E-EC81-4D08-9F78-026080EB1119}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4379D1FD-1473-4F17-9AC6-85B02EA83250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4379D1FD-1473-4F17-9AC6-85B02EA83250}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4379D1FD-1473-4F17-9AC6-85B02EA83250}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -88,18 +94,19 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}
-		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}
-		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}
-		{16B2F746-485C-4A15-883E-ABF2C885DD2A} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}
-		{8A5732F4-1562-4E5A-B2FF-E294ABC5EEFD} = {3F0D8988-4AFB-4AE2-9BA2-07E08765CCD1}
-		{97493212-ADF3-46AF-8669-F038964CDA22} = {19C079E3-367B-480E-A46E-8D56D47F94EA}
-		{4379D1FD-1473-4F17-9AC6-85B02EA83250} = {19C079E3-367B-480E-A46E-8D56D47F94EA}
-		{20F20695-DB18-47EB-A005-AA432ADCF865} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
-		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
-		{E0D760D1-21BC-468F-B599-858ECFF4AB1D} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
-		{441D4079-55B4-4C47-A0E5-1330DC9A31CB} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
-		{754403CE-ECFC-4EBA-8540-BEB67476FF9F} = {70E29C1C-AC9B-4E71-AB74-9906EF973EBF}
+		{97493212-ADF3-46AF-8669-F038964CDA22} = {4993DA3B-E035-45CA-A87C-C2A4A1E8B55B}
+		{ADE6745E-EC81-4D08-9F78-026080EB1119} = {4993DA3B-E035-45CA-A87C-C2A4A1E8B55B}
+		{4379D1FD-1473-4F17-9AC6-85B02EA83250} = {4993DA3B-E035-45CA-A87C-C2A4A1E8B55B}
+		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D} = {361E82BC-8FD2-45DF-986C-D7EE8F9A0709}
+		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28} = {361E82BC-8FD2-45DF-986C-D7EE8F9A0709}
+		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA} = {361E82BC-8FD2-45DF-986C-D7EE8F9A0709}
+		{16B2F746-485C-4A15-883E-ABF2C885DD2A} = {361E82BC-8FD2-45DF-986C-D7EE8F9A0709}
+		{8A5732F4-1562-4E5A-B2FF-E294ABC5EEFD} = {361E82BC-8FD2-45DF-986C-D7EE8F9A0709}
+		{20F20695-DB18-47EB-A005-AA432ADCF865} = {3A6B58E5-C830-4307-94A8-20081E6670F4}
+		{E0D760D1-21BC-468F-B599-858ECFF4AB1D} = {3A6B58E5-C830-4307-94A8-20081E6670F4}
+		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1} = {3A6B58E5-C830-4307-94A8-20081E6670F4}
+		{441D4079-55B4-4C47-A0E5-1330DC9A31CB} = {3A6B58E5-C830-4307-94A8-20081E6670F4}
+		{754403CE-ECFC-4EBA-8540-BEB67476FF9F} = {3A6B58E5-C830-4307-94A8-20081E6670F4}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4803416B-CE32-4730-905F-645A9B766D2B}
diff --git a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
index 577b2e4e094d31..75501eae83b1d1 100644
--- a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
+++ b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2231787B-18C9-493C-A102-1E0E6A3D2CD3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{282C76D4-54C5-44BF-9F15-1A4302234DBB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{A69B0EE0-BE0C-4D53-A16F-5465028D975D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "ref\System.Reflection.Metadata.csproj", "{587255BE-DC22-4B85-9E3F-02325E7B4FF7}"
@@ -13,13 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5E36AB65-74DD-47F5-8F2E-9050561BBFEE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0829DF11-6008-4678-B608-D754E87EBC70}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{57E0E2C2-76DD-4219-B164-E513C4F8BE01}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6BDCCC94-CB6D-433D-BE7D-C03A263EA1DC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E8418DF-67A1-4FA6-9241-215415C4D50A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F3617BA5-1BC2-4A8B-ACAC-F16A9C5D8FD3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{282C76D4-54C5-44BF-9F15-1A4302234DBB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A2C630EC-43FD-494C-9F7A-10DA1FA88C2D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,6 +27,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B905521A-FE25-4D35-9929-B2622F590263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B905521A-FE25-4D35-9929-B2622F590263}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B905521A-FE25-4D35-9929-B2622F590263}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B905521A-FE25-4D35-9929-B2622F590263}.Release|Any CPU.Build.0 = Release|Any CPU
 		{587255BE-DC22-4B85-9E3F-02325E7B4FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{587255BE-DC22-4B85-9E3F-02325E7B4FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{587255BE-DC22-4B85-9E3F-02325E7B4FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -35,10 +39,10 @@ Global
 		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B905521A-FE25-4D35-9929-B2622F590263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B905521A-FE25-4D35-9929-B2622F590263}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B905521A-FE25-4D35-9929-B2622F590263}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B905521A-FE25-4D35-9929-B2622F590263}.Release|Any CPU.Build.0 = Release|Any CPU
+		{282C76D4-54C5-44BF-9F15-1A4302234DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{282C76D4-54C5-44BF-9F15-1A4302234DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{282C76D4-54C5-44BF-9F15-1A4302234DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{282C76D4-54C5-44BF-9F15-1A4302234DBB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2231787B-18C9-493C-A102-1E0E6A3D2CD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2231787B-18C9-493C-A102-1E0E6A3D2CD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2231787B-18C9-493C-A102-1E0E6A3D2CD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,13 +64,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{587255BE-DC22-4B85-9E3F-02325E7B4FF7} = {0829DF11-6008-4678-B608-D754E87EBC70}
-		{00147002-F430-4E24-95F8-5E79A4D24AE2} = {0829DF11-6008-4678-B608-D754E87EBC70}
-		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE} = {57E0E2C2-76DD-4219-B164-E513C4F8BE01}
-		{2231787B-18C9-493C-A102-1E0E6A3D2CD3} = {57E0E2C2-76DD-4219-B164-E513C4F8BE01}
-		{B905521A-FE25-4D35-9929-B2622F590263} = {5E8418DF-67A1-4FA6-9241-215415C4D50A}
-		{A69B0EE0-BE0C-4D53-A16F-5465028D975D} = {5E8418DF-67A1-4FA6-9241-215415C4D50A}
-		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE} = {5E8418DF-67A1-4FA6-9241-215415C4D50A}
+		{B905521A-FE25-4D35-9929-B2622F590263} = {6BDCCC94-CB6D-433D-BE7D-C03A263EA1DC}
+		{A69B0EE0-BE0C-4D53-A16F-5465028D975D} = {6BDCCC94-CB6D-433D-BE7D-C03A263EA1DC}
+		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE} = {6BDCCC94-CB6D-433D-BE7D-C03A263EA1DC}
+		{587255BE-DC22-4B85-9E3F-02325E7B4FF7} = {F3617BA5-1BC2-4A8B-ACAC-F16A9C5D8FD3}
+		{282C76D4-54C5-44BF-9F15-1A4302234DBB} = {F3617BA5-1BC2-4A8B-ACAC-F16A9C5D8FD3}
+		{00147002-F430-4E24-95F8-5E79A4D24AE2} = {F3617BA5-1BC2-4A8B-ACAC-F16A9C5D8FD3}
+		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE} = {A2C630EC-43FD-494C-9F7A-10DA1FA88C2D}
+		{2231787B-18C9-493C-A102-1E0E6A3D2CD3} = {A2C630EC-43FD-494C-9F7A-10DA1FA88C2D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {64BB97AB-FD23-40BA-B638-FE4756AE6452}
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
index 4e9b5dc48484da..921f3a58d27579 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
+++ b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
@@ -1,8 +1,12 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A69770F-4F95-411F-ACAE-2B902EB62161}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{B34165DC-B130-4073-8960-AFDD4A4681CA}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\ref\System.Reflection.Metadata.csproj", "{31C9C6C5-DAE9-4281-858F-CC69ED9D23E9}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{499E5241-B46A-4161-A27C-C6D599070148}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext", "ref\System.Reflection.MetadataLoadContext.csproj", "{45C9DD05-BD43-49EB-84C3-668200358062}"
@@ -15,11 +19,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F45DECCA-03D3-4087-AB01-F099C027DC33}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6EF70F0D-2132-4494-B858-E755E3CE006D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B3731232-B2FE-401B-A9F1-5DFB1A90D687}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{313278DF-4A46-40C8-842A-F0C0295EF3DA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C24085A4-7C2F-423C-9667-B6BA2D429EDB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,14 +35,14 @@ Global
 		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45C9DD05-BD43-49EB-84C3-668200358062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45C9DD05-BD43-49EB-84C3-668200358062}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45C9DD05-BD43-49EB-84C3-668200358062}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45C9DD05-BD43-49EB-84C3-668200358062}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD06D785-53D2-4C11-895C-E9A24E23E276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD06D785-53D2-4C11-895C-E9A24E23E276}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD06D785-53D2-4C11-895C-E9A24E23E276}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD06D785-53D2-4C11-895C-E9A24E23E276}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45C9DD05-BD43-49EB-84C3-668200358062}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45C9DD05-BD43-49EB-84C3-668200358062}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45C9DD05-BD43-49EB-84C3-668200358062}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45C9DD05-BD43-49EB-84C3-668200358062}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A69770F-4F95-411F-ACAE-2B902EB62161}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A69770F-4F95-411F-ACAE-2B902EB62161}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A69770F-4F95-411F-ACAE-2B902EB62161}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +59,14 @@ Global
 		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B34165DC-B130-4073-8960-AFDD4A4681CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B34165DC-B130-4073-8960-AFDD4A4681CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B34165DC-B130-4073-8960-AFDD4A4681CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B34165DC-B130-4073-8960-AFDD4A4681CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31C9C6C5-DAE9-4281-858F-CC69ED9D23E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31C9C6C5-DAE9-4281-858F-CC69ED9D23E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31C9C6C5-DAE9-4281-858F-CC69ED9D23E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31C9C6C5-DAE9-4281-858F-CC69ED9D23E9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{89A190B3-9568-4057-A032-7D28262D51F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89A190B3-9568-4057-A032-7D28262D51F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{89A190B3-9568-4057-A032-7D28262D51F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -64,14 +76,16 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651} = {F45DECCA-03D3-4087-AB01-F099C027DC33}
-		{6A69770F-4F95-411F-ACAE-2B902EB62161} = {F45DECCA-03D3-4087-AB01-F099C027DC33}
-		{45C9DD05-BD43-49EB-84C3-668200358062} = {B3731232-B2FE-401B-A9F1-5DFB1A90D687}
-		{89A190B3-9568-4057-A032-7D28262D51F5} = {B3731232-B2FE-401B-A9F1-5DFB1A90D687}
-		{DD06D785-53D2-4C11-895C-E9A24E23E276} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
-		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
-		{499E5241-B46A-4161-A27C-C6D599070148} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
-		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619} = {C9409DA5-0A3B-4194-AEB8-3CA7A6D5387E}
+		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651} = {6EF70F0D-2132-4494-B858-E755E3CE006D}
+		{6A69770F-4F95-411F-ACAE-2B902EB62161} = {6EF70F0D-2132-4494-B858-E755E3CE006D}
+		{DD06D785-53D2-4C11-895C-E9A24E23E276} = {313278DF-4A46-40C8-842A-F0C0295EF3DA}
+		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C} = {313278DF-4A46-40C8-842A-F0C0295EF3DA}
+		{499E5241-B46A-4161-A27C-C6D599070148} = {313278DF-4A46-40C8-842A-F0C0295EF3DA}
+		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619} = {313278DF-4A46-40C8-842A-F0C0295EF3DA}
+		{45C9DD05-BD43-49EB-84C3-668200358062} = {C24085A4-7C2F-423C-9667-B6BA2D429EDB}
+		{B34165DC-B130-4073-8960-AFDD4A4681CA} = {C24085A4-7C2F-423C-9667-B6BA2D429EDB}
+		{31C9C6C5-DAE9-4281-858F-CC69ED9D23E9} = {C24085A4-7C2F-423C-9667-B6BA2D429EDB}
+		{89A190B3-9568-4057-A032-7D28262D51F5} = {C24085A4-7C2F-423C-9667-B6BA2D429EDB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CA7F05F8-4589-46FA-9AC5-4F96F2AE890C}
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
index 9d65b22616fecf..cda361f568b598 100644
--- a/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
+++ b/src/libraries/System.Runtime.Serialization.Formatters/System.Runtime.Serialization.Formatters.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj", "{82E81182-3C80-40A9-978A-4152461F4FE4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{28D20F20-2ED6-4456-9982-2B25FEC801EB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{81F58927-6022-4DD7-9E78-BDD3DA309285}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj", "{86557424-C2F0-4554-808F-4429FCEE1E9A}"
@@ -63,6 +65,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "..\S
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{1E395137-871B-4D6F-A7DB-C92850FAB0D3}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\ref\System.Reflection.Metadata.csproj", "{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{79F35586-A12D-4831-9D9D-5134FF07CC41}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}"
@@ -85,12 +89,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{3EA84883-E564-483D-A44E-FF1CC947B7A0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\ref\System.Text.Encoding.CodePages.csproj", "{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "..\System.Text.Encoding.CodePages\src\System.Text.Encoding.CodePages.csproj", "{7913F002-64DC-43C6-9D74-B0B9BA297F00}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "..\System.Text.Json\ref\System.Text.Json.csproj", "{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\ref\System.Threading.AccessControl.csproj", "{42927BD3-D5FA-464F-9F12-675DDB508518}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{26B82FDC-3524-4DAF-91E3-F5BA9F903906}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "..\System.Threading.Channels\ref\System.Threading.Channels.csproj", "{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "..\System.Threading.Channels\src\System.Threading.Channels.csproj", "{B6953324-8866-4D94-B352-20EF38EA6774}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}"
@@ -99,11 +111,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{78994C91-3A4F-4825-86C2-21FB4F082CA7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3B7A2D2D-5AAF-42D1-97C5-4B49CB32231F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{56502718-F82A-46E2-9AD0-532C437EC51E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{36CF66C3-C441-467D-B0F8-759F68DCD823}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{10338902-BE81-4BE0-A5D9-FAE22A6C4988}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -118,42 +130,6 @@ Global
 		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x86.Build.0 = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x64.ActiveCfg = Release|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x64.Build.0 = Release|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x86.ActiveCfg = Release|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x86.Build.0 = Release|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x64.Build.0 = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x86.Build.0 = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x64.Build.0 = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x86.Build.0 = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x64.ActiveCfg = Release|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x64.Build.0 = Release|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x86.ActiveCfg = Release|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x86.Build.0 = Release|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x64.Build.0 = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x86.Build.0 = Debug|Any CPU
 		{3D4DD468-10FE-4606-BA10-F848447AF157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D4DD468-10FE-4606-BA10-F848447AF157}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3D4DD468-10FE-4606-BA10-F848447AF157}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -172,6 +148,42 @@ Global
 		{3D4DD468-10FE-4606-BA10-F848447AF157}.Checked|x64.Build.0 = Debug|Any CPU
 		{3D4DD468-10FE-4606-BA10-F848447AF157}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{3D4DD468-10FE-4606-BA10-F848447AF157}.Checked|x86.Build.0 = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Debug|x86.Build.0 = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x64.Build.0 = Release|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Release|x86.Build.0 = Release|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x64.Build.0 = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x86.Build.0 = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x64.Build.0 = Release|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Release|x86.Build.0 = Release|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x64.Build.0 = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x86.Build.0 = Debug|Any CPU
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -190,6 +202,24 @@ Global
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x64.Build.0 = Debug|Any CPU
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x86.Build.0 = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Debug|x64.Build.0 = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Debug|x86.Build.0 = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Release|x64.ActiveCfg = Release|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Release|x64.Build.0 = Release|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Release|x86.ActiveCfg = Release|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Release|x86.Build.0 = Release|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Checked|x64.Build.0 = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA}.Checked|x86.Build.0 = Debug|Any CPU
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -208,60 +238,6 @@ Global
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Checked|x64.Build.0 = Debug|Any CPU
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Checked|x86.Build.0 = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x64.Build.0 = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x86.Build.0 = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x64.ActiveCfg = Release|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x64.Build.0 = Release|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x86.ActiveCfg = Release|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x86.Build.0 = Release|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x64.Build.0 = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x86.Build.0 = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x64.Build.0 = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x86.Build.0 = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x64.ActiveCfg = Release|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x64.Build.0 = Release|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x86.ActiveCfg = Release|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x86.Build.0 = Release|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x64.Build.0 = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x86.Build.0 = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x64.Build.0 = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x86.Build.0 = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x64.ActiveCfg = Release|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x64.Build.0 = Release|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x86.ActiveCfg = Release|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x86.Build.0 = Release|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x64.Build.0 = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x86.Build.0 = Debug|Any CPU
 		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -280,24 +256,6 @@ Global
 		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Checked|x64.Build.0 = Debug|Any CPU
 		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Checked|x86.Build.0 = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x64.Build.0 = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x86.Build.0 = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x64.ActiveCfg = Release|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x64.Build.0 = Release|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x86.ActiveCfg = Release|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x86.Build.0 = Release|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x64.Build.0 = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x86.Build.0 = Debug|Any CPU
 		{5F31A880-2571-46BC-AD68-D0896F613570}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5F31A880-2571-46BC-AD68-D0896F613570}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5F31A880-2571-46BC-AD68-D0896F613570}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -316,6 +274,60 @@ Global
 		{5F31A880-2571-46BC-AD68-D0896F613570}.Checked|x64.Build.0 = Debug|Any CPU
 		{5F31A880-2571-46BC-AD68-D0896F613570}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{5F31A880-2571-46BC-AD68-D0896F613570}.Checked|x86.Build.0 = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x64.Build.0 = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x64.Build.0 = Release|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Release|x86.Build.0 = Release|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x64.Build.0 = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x86.Build.0 = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x64.Build.0 = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Debug|x86.Build.0 = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x64.ActiveCfg = Release|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x64.Build.0 = Release|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x86.ActiveCfg = Release|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Release|x86.Build.0 = Release|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x64.Build.0 = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x86.Build.0 = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x64.Build.0 = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Debug|x86.Build.0 = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x64.ActiveCfg = Release|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x64.Build.0 = Release|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x86.ActiveCfg = Release|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Release|x86.Build.0 = Release|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x64.Build.0 = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x86.Build.0 = Debug|Any CPU
 		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -334,24 +346,24 @@ Global
 		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Checked|x64.Build.0 = Debug|Any CPU
 		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Checked|x86.Build.0 = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x64.Build.0 = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x86.Build.0 = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x64.ActiveCfg = Release|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x64.Build.0 = Release|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x86.ActiveCfg = Release|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x86.Build.0 = Release|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x64.Build.0 = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x86.Build.0 = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x64.Build.0 = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Debug|x86.Build.0 = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x64.ActiveCfg = Release|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x64.Build.0 = Release|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x86.ActiveCfg = Release|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Release|x86.Build.0 = Release|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x64.Build.0 = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x86.Build.0 = Debug|Any CPU
 		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -370,22 +382,40 @@ Global
 		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Checked|x64.Build.0 = Debug|Any CPU
 		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Checked|x86.Build.0 = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x64.Build.0 = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x86.Build.0 = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x64.ActiveCfg = Release|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x64.Build.0 = Release|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x86.ActiveCfg = Release|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x86.Build.0 = Release|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x64.Build.0 = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x64.Build.0 = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Debug|x86.Build.0 = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x64.ActiveCfg = Release|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x64.Build.0 = Release|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x86.ActiveCfg = Release|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Release|x86.Build.0 = Release|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x64.Build.0 = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x86.Build.0 = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x64.Build.0 = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Debug|x86.Build.0 = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x64.ActiveCfg = Release|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x64.Build.0 = Release|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x86.ActiveCfg = Release|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Release|x86.Build.0 = Release|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x64.Build.0 = Debug|Any CPU
 		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x86.Build.0 = Debug|Any CPU
 		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -406,6 +436,24 @@ Global
 		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Checked|x64.Build.0 = Debug|Any CPU
 		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Checked|x86.Build.0 = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x64.Build.0 = Release|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x86.Build.0 = Release|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x64.Build.0 = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x86.Build.0 = Debug|Any CPU
 		{82E81182-3C80-40A9-978A-4152461F4FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{82E81182-3C80-40A9-978A-4152461F4FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82E81182-3C80-40A9-978A-4152461F4FE4}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -442,42 +490,6 @@ Global
 		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Checked|x64.Build.0 = Debug|Any CPU
 		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Checked|x86.Build.0 = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x64.Build.0 = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Debug|x86.Build.0 = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x64.ActiveCfg = Release|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x64.Build.0 = Release|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x86.ActiveCfg = Release|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Release|x86.Build.0 = Release|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x64.Build.0 = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x86.Build.0 = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x64.Build.0 = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x86.Build.0 = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x64.ActiveCfg = Release|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x64.Build.0 = Release|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x86.ActiveCfg = Release|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x86.Build.0 = Release|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x64.Build.0 = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.Build.0 = Debug|Any CPU
 		{B6953324-8866-4D94-B352-20EF38EA6774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B6953324-8866-4D94-B352-20EF38EA6774}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B6953324-8866-4D94-B352-20EF38EA6774}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -496,6 +508,24 @@ Global
 		{B6953324-8866-4D94-B352-20EF38EA6774}.Checked|x64.Build.0 = Debug|Any CPU
 		{B6953324-8866-4D94-B352-20EF38EA6774}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{B6953324-8866-4D94-B352-20EF38EA6774}.Checked|x86.Build.0 = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x64.Build.0 = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Debug|x86.Build.0 = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x64.ActiveCfg = Release|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x64.Build.0 = Release|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x86.ActiveCfg = Release|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Release|x86.Build.0 = Release|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x64.Build.0 = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.Build.0 = Debug|Any CPU
 		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Debug|Any CPU.Build.0 = Debug|x64
 		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Debug|x64.ActiveCfg = Debug|x64
@@ -514,6 +544,42 @@ Global
 		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Checked|x64.Build.0 = Checked|x64
 		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Checked|x86.ActiveCfg = Checked|x86
 		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Checked|x86.Build.0 = Checked|x86
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Debug|x64.Build.0 = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Debug|x86.Build.0 = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Release|x64.ActiveCfg = Release|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Release|x64.Build.0 = Release|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Release|x86.Build.0 = Release|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Checked|x64.Build.0 = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7}.Checked|x86.Build.0 = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x64.Build.0 = Release|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x86.Build.0 = Release|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x64.Build.0 = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x86.Build.0 = Debug|Any CPU
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -532,6 +598,24 @@ Global
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Checked|x64.Build.0 = Debug|Any CPU
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Checked|x86.Build.0 = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x86.Build.0 = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x64.Build.0 = Release|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x86.ActiveCfg = Release|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x86.Build.0 = Release|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x64.Build.0 = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x86.Build.0 = Debug|Any CPU
 		{1A591DF1-D797-4820-BC9A-6060B1444213}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1A591DF1-D797-4820-BC9A-6060B1444213}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1A591DF1-D797-4820-BC9A-6060B1444213}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -550,78 +634,6 @@ Global
 		{1A591DF1-D797-4820-BC9A-6060B1444213}.Checked|x64.Build.0 = Debug|Any CPU
 		{1A591DF1-D797-4820-BC9A-6060B1444213}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{1A591DF1-D797-4820-BC9A-6060B1444213}.Checked|x86.Build.0 = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x64.Build.0 = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x86.Build.0 = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x64.ActiveCfg = Release|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x64.Build.0 = Release|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x86.ActiveCfg = Release|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x86.Build.0 = Release|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x64.Build.0 = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x86.Build.0 = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x64.Build.0 = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x86.Build.0 = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x64.ActiveCfg = Release|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x64.Build.0 = Release|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x86.ActiveCfg = Release|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x86.Build.0 = Release|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x64.Build.0 = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x86.Build.0 = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x64.Build.0 = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x86.Build.0 = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x64.ActiveCfg = Release|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x64.Build.0 = Release|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x86.ActiveCfg = Release|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x86.Build.0 = Release|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x64.Build.0 = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x86.Build.0 = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x64.Build.0 = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x86.Build.0 = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x64.ActiveCfg = Release|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x64.Build.0 = Release|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x86.ActiveCfg = Release|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x86.Build.0 = Release|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x64.Build.0 = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x86.Build.0 = Debug|Any CPU
 		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -658,6 +670,42 @@ Global
 		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|x64.Build.0 = Debug|Any CPU
 		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|x86.Build.0 = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x64.Build.0 = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Debug|x86.Build.0 = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x64.ActiveCfg = Release|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x64.Build.0 = Release|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x86.ActiveCfg = Release|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Release|x86.Build.0 = Release|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x64.Build.0 = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x86.Build.0 = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x64.Build.0 = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Debug|x86.Build.0 = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x64.ActiveCfg = Release|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x64.Build.0 = Release|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x86.ActiveCfg = Release|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Release|x86.Build.0 = Release|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x64.Build.0 = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076}.Checked|x86.Build.0 = Debug|Any CPU
 		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -676,24 +724,24 @@ Global
 		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Checked|x64.Build.0 = Debug|Any CPU
 		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Checked|x86.Build.0 = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x64.Build.0 = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x86.Build.0 = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x64.ActiveCfg = Release|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x64.Build.0 = Release|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x86.ActiveCfg = Release|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x86.Build.0 = Release|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x64.Build.0 = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x86.Build.0 = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x64.Build.0 = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Debug|x86.Build.0 = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x64.ActiveCfg = Release|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x64.Build.0 = Release|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x86.ActiveCfg = Release|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Release|x86.Build.0 = Release|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x64.Build.0 = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x86.Build.0 = Debug|Any CPU
 		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -712,60 +760,24 @@ Global
 		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Checked|x64.Build.0 = Debug|Any CPU
 		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Checked|x86.Build.0 = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x64.Build.0 = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x86.Build.0 = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x64.ActiveCfg = Release|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x64.Build.0 = Release|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x86.Build.0 = Release|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x64.Build.0 = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x86.Build.0 = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x64.Build.0 = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Debug|x86.Build.0 = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x64.ActiveCfg = Release|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x64.Build.0 = Release|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x86.ActiveCfg = Release|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Release|x86.Build.0 = Release|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x64.Build.0 = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x86.Build.0 = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x64.Build.0 = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x86.Build.0 = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x64.ActiveCfg = Release|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x64.Build.0 = Release|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x86.ActiveCfg = Release|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x86.Build.0 = Release|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x64.Build.0 = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x86.Build.0 = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x64.Build.0 = Release|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Release|x86.Build.0 = Release|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x64.Build.0 = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x86.Build.0 = Debug|Any CPU
 		{4E423476-3653-402A-AD55-0E5111A96ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4E423476-3653-402A-AD55-0E5111A96ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4E423476-3653-402A-AD55-0E5111A96ACC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -784,6 +796,42 @@ Global
 		{4E423476-3653-402A-AD55-0E5111A96ACC}.Checked|x64.Build.0 = Debug|Any CPU
 		{4E423476-3653-402A-AD55-0E5111A96ACC}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{4E423476-3653-402A-AD55-0E5111A96ACC}.Checked|x86.Build.0 = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Debug|x86.Build.0 = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x64.Build.0 = Release|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Release|x86.Build.0 = Release|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x64.Build.0 = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x86.Build.0 = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x64.Build.0 = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Debug|x86.Build.0 = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x64.ActiveCfg = Release|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x64.Build.0 = Release|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x86.ActiveCfg = Release|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Release|x86.Build.0 = Release|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x64.Build.0 = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x86.Build.0 = Debug|Any CPU
 		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -802,24 +850,24 @@ Global
 		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Checked|x64.Build.0 = Debug|Any CPU
 		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Checked|x86.Build.0 = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x64.Build.0 = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Debug|x86.Build.0 = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x64.ActiveCfg = Release|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x64.Build.0 = Release|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x86.ActiveCfg = Release|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Release|x86.Build.0 = Release|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x64.Build.0 = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x86.Build.0 = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x64.Build.0 = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Debug|x86.Build.0 = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x64.ActiveCfg = Release|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x64.Build.0 = Release|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x86.ActiveCfg = Release|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Release|x86.Build.0 = Release|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x64.Build.0 = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x86.Build.0 = Debug|Any CPU
 		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -856,6 +904,24 @@ Global
 		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x64.Build.0 = Debug|Any CPU
 		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x86.Build.0 = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x64.Build.0 = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x86.Build.0 = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x64.ActiveCfg = Release|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x64.Build.0 = Release|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x86.ActiveCfg = Release|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x86.Build.0 = Release|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x64.Build.0 = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x86.Build.0 = Debug|Any CPU
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -874,6 +940,24 @@ Global
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Checked|x64.Build.0 = Debug|Any CPU
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Checked|x86.Build.0 = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Debug|x64.Build.0 = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Debug|x86.Build.0 = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Release|x64.ActiveCfg = Release|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Release|x64.Build.0 = Release|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Release|x86.ActiveCfg = Release|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Release|x86.Build.0 = Release|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Checked|x64.Build.0 = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A}.Checked|x86.Build.0 = Debug|Any CPU
 		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -892,24 +976,24 @@ Global
 		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Checked|x64.Build.0 = Debug|Any CPU
 		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Checked|x86.Build.0 = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x64.Build.0 = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Debug|x86.Build.0 = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x64.ActiveCfg = Release|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x64.Build.0 = Release|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x86.ActiveCfg = Release|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Release|x86.Build.0 = Release|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x64.Build.0 = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x86.Build.0 = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Release|x64.Build.0 = Release|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Release|x86.Build.0 = Release|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Checked|x64.Build.0 = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1}.Checked|x86.Build.0 = Debug|Any CPU
 		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -964,24 +1048,24 @@ Global
 		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Checked|x64.Build.0 = Debug|Any CPU
 		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Checked|x86.Build.0 = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x64.Build.0 = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x86.Build.0 = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x64.ActiveCfg = Release|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x64.Build.0 = Release|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x86.ActiveCfg = Release|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x86.Build.0 = Release|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|Any CPU.Build.0 = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x64.ActiveCfg = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x64.Build.0 = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x86.ActiveCfg = Debug|Any CPU
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x86.Build.0 = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Debug|x64.Build.0 = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Debug|x86.Build.0 = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Release|x64.ActiveCfg = Release|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Release|x64.Build.0 = Release|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Release|x86.ActiveCfg = Release|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Release|x86.Build.0 = Release|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Checked|x64.Build.0 = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2}.Checked|x86.Build.0 = Debug|Any CPU
 		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1000,6 +1084,42 @@ Global
 		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Checked|x64.Build.0 = Debug|Any CPU
 		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Checked|x86.ActiveCfg = Debug|Any CPU
 		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Checked|x86.Build.0 = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x64.Build.0 = Release|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Release|x86.Build.0 = Release|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x64.Build.0 = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x86.Build.0 = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Debug|x64.Build.0 = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Release|x64.ActiveCfg = Release|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Release|x64.Build.0 = Release|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Release|x86.Build.0 = Release|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Checked|Any CPU.Build.0 = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Checked|x64.Build.0 = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB}.Checked|x86.Build.0 = Debug|Any CPU
 		{E92F7B7A-D34D-49B8-8857-09936624E038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E92F7B7A-D34D-49B8-8857-09936624E038}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E92F7B7A-D34D-49B8-8857-09936624E038}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -1023,56 +1143,62 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{FA9FDA97-57C2-421C-A578-EEB0B600A412} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{A472E78C-3184-480F-97F2-6B89A10E1A87} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{14C1E145-621A-496F-AC3D-DCDF116C8AD9} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{5F31A880-2571-46BC-AD68-D0896F613570} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{9E471AE8-A165-4B32-8603-2BABD02A0664} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{D3535D48-5700-4DB1-AEED-494650BAB175} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{711CBCE0-C21C-45DA-B0D2-D2298941058E} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{82E81182-3C80-40A9-978A-4152461F4FE4} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{86557424-C2F0-4554-808F-4429FCEE1E9A} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{79F35586-A12D-4831-9D9D-5134FF07CC41} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{B6953324-8866-4D94-B352-20EF38EA6774} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{096171D9-C978-4509-B9D3-B6DBCD78420D} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{26B82FDC-3524-4DAF-91E3-F5BA9F903906} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{D5D66E77-D7E7-4DCC-964D-C899AFE29076} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{7913F002-64DC-43C6-9D74-B0B9BA297F00} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{3EA84883-E564-483D-A44E-FF1CC947B7A0} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{6B34282C-D54D-44F2-B40F-04E6E0F054CB} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{1E395137-871B-4D6F-A7DB-C92850FAB0D3} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{81F58927-6022-4DD7-9E78-BDD3DA309285} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{78994C91-3A4F-4825-86C2-21FB4F082CA7} = {38DE9ACA-E3C9-44BC-B7C3-A5BF363D85D7}
-		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{A1BEF14B-0C13-4854-8299-DADF0D1181D9} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{1A591DF1-D797-4820-BC9A-6060B1444213} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{8307AA11-40DC-44AD-8F0E-567923BDC752} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{28BA346E-BF18-45AF-B0D2-15A5969F7975} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{80DC7480-77B6-4D7D-AE6A-AA31366D2055} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{35B1EF33-126D-4769-B593-14DDDD630AB2} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{61914172-8197-4E04-9CE7-82C25D0AC8F2} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{C9142466-56E3-412F-AD42-FF5CF05D8DB1} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{6F5E7FFC-8709-4072-B0B3-404BEB517394} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{4E423476-3653-402A-AD55-0E5111A96ACC} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{143DCF72-7DD7-4365-8B47-D67010F662A1} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{42927BD3-D5FA-464F-9F12-675DDB508518} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{D0E065A2-7569-4F40-8D3C-7889BA1A3006} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{E92F7B7A-D34D-49B8-8857-09936624E038} = {56502718-F82A-46E2-9AD0-532C437EC51E}
-		{3D4DD468-10FE-4606-BA10-F848447AF157} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}
-		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {F8CB1B1F-F935-4ECE-B3C2-CF62B5654BF2}
+		{3D4DD468-10FE-4606-BA10-F848447AF157} = {3B7A2D2D-5AAF-42D1-97C5-4B49CB32231F}
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {3B7A2D2D-5AAF-42D1-97C5-4B49CB32231F}
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{88A3BB11-72C4-4096-BD9B-B2FAC711AADA} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{EE1086CF-3CA6-42CF-BCA7-D48575577BB7} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{1A591DF1-D797-4820-BC9A-6060B1444213} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{35B1EF33-126D-4769-B593-14DDDD630AB2} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{8307AA11-40DC-44AD-8F0E-567923BDC752} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{4E423476-3653-402A-AD55-0E5111A96ACC} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{724BB015-B1F3-454A-B0D0-5A93EB3BEF7A} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{54BAC95F-DDB3-48B5-A3DC-123A5F352DF1} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{143DCF72-7DD7-4365-8B47-D67010F662A1} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{42927BD3-D5FA-464F-9F12-675DDB508518} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{31F7EA38-5E9D-45A0-BE08-D24B69033BE2} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{28D20F20-2ED6-4456-9982-2B25FEC801EB} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{E92F7B7A-D34D-49B8-8857-09936624E038} = {36CF66C3-C441-467D-B0F8-759F68DCD823}
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{5F31A880-2571-46BC-AD68-D0896F613570} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{A472E78C-3184-480F-97F2-6B89A10E1A87} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{9E471AE8-A165-4B32-8603-2BABD02A0664} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{D3535D48-5700-4DB1-AEED-494650BAB175} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{82E81182-3C80-40A9-978A-4152461F4FE4} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{86557424-C2F0-4554-808F-4429FCEE1E9A} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{B6953324-8866-4D94-B352-20EF38EA6774} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{79F35586-A12D-4831-9D9D-5134FF07CC41} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{096171D9-C978-4509-B9D3-B6DBCD78420D} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{D5D66E77-D7E7-4DCC-964D-C899AFE29076} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{81F58927-6022-4DD7-9E78-BDD3DA309285} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7} = {10338902-BE81-4BE0-A5D9-FAE22A6C4988}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {158060A0-BFF9-48E6-90A9-93F52FEB5D3B}
diff --git a/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln b/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
index 79b76a45f5d0e0..5762422ee85ce9 100644
--- a/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
+++ b/src/libraries/System.Security.Cryptography.Algorithms/System.Security.Cryptography.Algorithms.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{1FC39B3B-117D-4C09-8F20-2D3E6C935456}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{AA21E963-CF6B-4474-81A6-D13279854954}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}"
@@ -19,11 +21,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj", "{E5E427F0-D149-4992-AF31-F8616600E188}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FC920C3F-3A16-4258-9DF1-3B1BB3408C69}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5B9DBEB1-D0B6-400F-9703-2B1B9FC4B681}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A579EE19-5B68-4E9D-BAC6-8B75536FFB98}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E1E4A0E2-29EB-4AD3-B867-7D8882E69184}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F0C27229-8F6C-455B-8592-4F12B1F38045}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,14 +37,14 @@ Global
 		{64C0BC45-368B-44E6-9E04-2F7787CDF153}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{64C0BC45-368B-44E6-9E04-2F7787CDF153}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64C0BC45-368B-44E6-9E04-2F7787CDF153}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -59,14 +61,18 @@ Global
 		{AA21E963-CF6B-4474-81A6-D13279854954}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA21E963-CF6B-4474-81A6-D13279854954}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA21E963-CF6B-4474-81A6-D13279854954}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{11EF92B5-6C9B-4272-8360-F34A1109F831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{11EF92B5-6C9B-4272-8360-F34A1109F831}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{11EF92B5-6C9B-4272-8360-F34A1109F831}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{11EF92B5-6C9B-4272-8360-F34A1109F831}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FC39B3B-117D-4C09-8F20-2D3E6C935456}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FC39B3B-117D-4C09-8F20-2D3E6C935456}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FC39B3B-117D-4C09-8F20-2D3E6C935456}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FC39B3B-117D-4C09-8F20-2D3E6C935456}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -76,16 +82,17 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{64C0BC45-368B-44E6-9E04-2F7787CDF153} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69}
-		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69}
-		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40} = {FC920C3F-3A16-4258-9DF1-3B1BB3408C69}
-		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD} = {A579EE19-5B68-4E9D-BAC6-8B75536FFB98}
-		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0} = {A579EE19-5B68-4E9D-BAC6-8B75536FFB98}
-		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}
-		{3928EE57-D7D0-45B8-AACD-57DF67D7089A} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}
-		{E5E427F0-D149-4992-AF31-F8616600E188} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}
-		{AA21E963-CF6B-4474-81A6-D13279854954} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}
-		{11EF92B5-6C9B-4272-8360-F34A1109F831} = {5D6E7D5F-CA32-4F61-8664-ED39FEFB01D1}
+		{64C0BC45-368B-44E6-9E04-2F7787CDF153} = {5B9DBEB1-D0B6-400F-9703-2B1B9FC4B681}
+		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8} = {5B9DBEB1-D0B6-400F-9703-2B1B9FC4B681}
+		{1FC39B3B-117D-4C09-8F20-2D3E6C935456} = {5B9DBEB1-D0B6-400F-9703-2B1B9FC4B681}
+		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40} = {5B9DBEB1-D0B6-400F-9703-2B1B9FC4B681}
+		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA} = {E1E4A0E2-29EB-4AD3-B867-7D8882E69184}
+		{3928EE57-D7D0-45B8-AACD-57DF67D7089A} = {E1E4A0E2-29EB-4AD3-B867-7D8882E69184}
+		{E5E427F0-D149-4992-AF31-F8616600E188} = {E1E4A0E2-29EB-4AD3-B867-7D8882E69184}
+		{AA21E963-CF6B-4474-81A6-D13279854954} = {E1E4A0E2-29EB-4AD3-B867-7D8882E69184}
+		{11EF92B5-6C9B-4272-8360-F34A1109F831} = {E1E4A0E2-29EB-4AD3-B867-7D8882E69184}
+		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD} = {F0C27229-8F6C-455B-8592-4F12B1F38045}
+		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0} = {F0C27229-8F6C-455B-8592-4F12B1F38045}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FBAD4B5E-6059-47BF-A909-9D20CE67E4E0}
diff --git a/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln b/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
index 7371245a151ef8..24c6a646d880a1 100644
--- a/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
+++ b/src/libraries/System.Security.Cryptography.Cng/System.Security.Cryptography.Cng.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7FAF92EB-F974-4279-8ED4-431ADAF3584C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{3DE7D652-E62F-4E2F-9808-C66355A57445}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{28FC516D-19C2-43C6-BCBE-10273185673D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{866AEC4B-C3DE-4F2C-B6E9-7628856FA078}"
@@ -15,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{929388A9-0224-4FF8-867A-267E47A03311}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B5CC70E-D006-426A-BC91-6A7DEE2F7181}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FB886A53-C6A4-4101-B785-05271DFFCFB5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1D9900D4-8DD5-4936-BE7A-4D4126E16459}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AFE4F219-70BF-4B5B-A724-1FD2BB061B56}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EC42BE1B-70E9-4248-9E0F-288C6677A579}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8EA91B81-2BF5-42D2-8621-E2A6F8BA6828}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,30 +33,34 @@ Global
 		{B88D8B7E-7682-4F23-82AF-DF186BDD3255}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B88D8B7E-7682-4F23-82AF-DF186BDD3255}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B88D8B7E-7682-4F23-82AF-DF186BDD3255}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4BAA22AA-6F42-4C31-8CCF-256F30A26228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4BAA22AA-6F42-4C31-8CCF-256F30A26228}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BAA22AA-6F42-4C31-8CCF-256F30A26228}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4BAA22AA-6F42-4C31-8CCF-256F30A26228}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DCE069F-1F04-45F7-AA64-CE095F9DA385}.Release|Any CPU.Build.0 = Release|Any CPU
 		{28FC516D-19C2-43C6-BCBE-10273185673D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{28FC516D-19C2-43C6-BCBE-10273185673D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28FC516D-19C2-43C6-BCBE-10273185673D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28FC516D-19C2-43C6-BCBE-10273185673D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{929388A9-0224-4FF8-867A-267E47A03311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{929388A9-0224-4FF8-867A-267E47A03311}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{929388A9-0224-4FF8-867A-267E47A03311}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{929388A9-0224-4FF8-867A-267E47A03311}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FAF92EB-F974-4279-8ED4-431ADAF3584C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{929388A9-0224-4FF8-867A-267E47A03311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{929388A9-0224-4FF8-867A-267E47A03311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{929388A9-0224-4FF8-867A-267E47A03311}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{929388A9-0224-4FF8-867A-267E47A03311}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39FEA352-F1A3-48AC-89FE-79E976218AC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39FEA352-F1A3-48AC-89FE-79E976218AC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39FEA352-F1A3-48AC-89FE-79E976218AC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39FEA352-F1A3-48AC-89FE-79E976218AC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DE7D652-E62F-4E2F-9808-C66355A57445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DE7D652-E62F-4E2F-9808-C66355A57445}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DE7D652-E62F-4E2F-9808-C66355A57445}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DE7D652-E62F-4E2F-9808-C66355A57445}.Release|Any CPU.Build.0 = Release|Any CPU
 		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -64,14 +70,15 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{B88D8B7E-7682-4F23-82AF-DF186BDD3255} = {3B5CC70E-D006-426A-BC91-6A7DEE2F7181}
-		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078} = {3B5CC70E-D006-426A-BC91-6A7DEE2F7181}
-		{4DCE069F-1F04-45F7-AA64-CE095F9DA385} = {1D9900D4-8DD5-4936-BE7A-4D4126E16459}
-		{7FAF92EB-F974-4279-8ED4-431ADAF3584C} = {1D9900D4-8DD5-4936-BE7A-4D4126E16459}
-		{4BAA22AA-6F42-4C31-8CCF-256F30A26228} = {EC42BE1B-70E9-4248-9E0F-288C6677A579}
-		{28FC516D-19C2-43C6-BCBE-10273185673D} = {EC42BE1B-70E9-4248-9E0F-288C6677A579}
-		{929388A9-0224-4FF8-867A-267E47A03311} = {EC42BE1B-70E9-4248-9E0F-288C6677A579}
-		{39FEA352-F1A3-48AC-89FE-79E976218AC1} = {EC42BE1B-70E9-4248-9E0F-288C6677A579}
+		{B88D8B7E-7682-4F23-82AF-DF186BDD3255} = {FB886A53-C6A4-4101-B785-05271DFFCFB5}
+		{3DE7D652-E62F-4E2F-9808-C66355A57445} = {FB886A53-C6A4-4101-B785-05271DFFCFB5}
+		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078} = {FB886A53-C6A4-4101-B785-05271DFFCFB5}
+		{4BAA22AA-6F42-4C31-8CCF-256F30A26228} = {AFE4F219-70BF-4B5B-A724-1FD2BB061B56}
+		{28FC516D-19C2-43C6-BCBE-10273185673D} = {AFE4F219-70BF-4B5B-A724-1FD2BB061B56}
+		{929388A9-0224-4FF8-867A-267E47A03311} = {AFE4F219-70BF-4B5B-A724-1FD2BB061B56}
+		{39FEA352-F1A3-48AC-89FE-79E976218AC1} = {AFE4F219-70BF-4B5B-A724-1FD2BB061B56}
+		{4DCE069F-1F04-45F7-AA64-CE095F9DA385} = {8EA91B81-2BF5-42D2-8621-E2A6F8BA6828}
+		{7FAF92EB-F974-4279-8ED4-431ADAF3584C} = {8EA91B81-2BF5-42D2-8621-E2A6F8BA6828}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {219CF3E9-50CB-43C5-99B4-9F8B23255A31}
diff --git a/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln b/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
index e910597a90bcb1..f470d9fa8f71e6 100644
--- a/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
+++ b/src/libraries/System.Security.Cryptography.Csp/System.Security.Cryptography.Csp.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CC4119F0-EEF6-4443-A3BD-D21063991D8B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{BE088BCA-5EE4-4883-A469-E6344EC98F4A}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}"
@@ -15,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Csp.Tests", "tests\System.Security.Cryptography.Csp.Tests.csproj", "{9136AFBB-5173-4AD7-AD77-641E1EB8506C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{21527B75-9B77-45A8-A6AD-23514790D138}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{383B91A8-7022-4B83-82F5-0CF055472A0D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{98857D10-F221-4AF0-AD86-22E6BDDC8B02}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{004448ED-CE3D-4EEE-B176-458440B11AEB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7F3DFFC2-B410-4276-9F13-940516C83B79}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -31,14 +33,14 @@ Global
 		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{153000A6-96D2-4E0D-8E34-13B85E8ECACD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{153000A6-96D2-4E0D-8E34-13B85E8ECACD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{153000A6-96D2-4E0D-8E34-13B85E8ECACD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{153000A6-96D2-4E0D-8E34-13B85E8ECACD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9136AFBB-5173-4AD7-AD77-641E1EB8506C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,6 +57,10 @@ Global
 		{441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE088BCA-5EE4-4883-A469-E6344EC98F4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE088BCA-5EE4-4883-A469-E6344EC98F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE088BCA-5EE4-4883-A469-E6344EC98F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE088BCA-5EE4-4883-A469-E6344EC98F4A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -64,14 +70,15 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9} = {1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9}
-		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF} = {1F3677F4-9173-4B3A-BE7B-9616A7A5FDA9}
-		{9136AFBB-5173-4AD7-AD77-641E1EB8506C} = {383B91A8-7022-4B83-82F5-0CF055472A0D}
-		{CC4119F0-EEF6-4443-A3BD-D21063991D8B} = {383B91A8-7022-4B83-82F5-0CF055472A0D}
-		{153000A6-96D2-4E0D-8E34-13B85E8ECACD} = {004448ED-CE3D-4EEE-B176-458440B11AEB}
-		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10} = {004448ED-CE3D-4EEE-B176-458440B11AEB}
-		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C} = {004448ED-CE3D-4EEE-B176-458440B11AEB}
-		{441BBB8B-D6D7-4518-83B6-687AFC2C6202} = {004448ED-CE3D-4EEE-B176-458440B11AEB}
+		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9} = {21527B75-9B77-45A8-A6AD-23514790D138}
+		{BE088BCA-5EE4-4883-A469-E6344EC98F4A} = {21527B75-9B77-45A8-A6AD-23514790D138}
+		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF} = {21527B75-9B77-45A8-A6AD-23514790D138}
+		{153000A6-96D2-4E0D-8E34-13B85E8ECACD} = {98857D10-F221-4AF0-AD86-22E6BDDC8B02}
+		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10} = {98857D10-F221-4AF0-AD86-22E6BDDC8B02}
+		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C} = {98857D10-F221-4AF0-AD86-22E6BDDC8B02}
+		{441BBB8B-D6D7-4518-83B6-687AFC2C6202} = {98857D10-F221-4AF0-AD86-22E6BDDC8B02}
+		{9136AFBB-5173-4AD7-AD77-641E1EB8506C} = {7F3DFFC2-B410-4276-9F13-940516C83B79}
+		{CC4119F0-EEF6-4443-A3BD-D21063991D8B} = {7F3DFFC2-B410-4276-9F13-940516C83B79}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C1FD6721-0F7E-4ACC-8409-4E518EA1C98A}
diff --git a/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln b/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
index 550ab1ac27aa05..ea6d272c717017 100644
--- a/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
+++ b/src/libraries/System.Security.Cryptography.OpenSsl/System.Security.Cryptography.OpenSsl.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{29991657-E677-42A4-894C-6BE781C51DD7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{E7CD348F-E10F-4FBF-82C7-89C4AE971C8F}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}"
@@ -15,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl.Tests", "tests\System.Security.Cryptography.OpenSsl.Tests.csproj", "{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8B6D53E6-8F7B-47D1-B6D7-890A783A9959}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C7E70291-2F6D-4258-8A73-2B71E3722537}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4562CA8C-1A07-4AFB-B5BC-977FD19605CB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{78B48B8F-9235-4AFD-B97C-FAE3EE5B5C92}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A253B72C-7AA0-416A-92E6-09D5DCF906E7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{583D2800-0B5D-4344-AA9F-140BD538B8FD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,6 +53,10 @@ Global
 		{12345E87-4C47-4857-B7E4-6673D6ECC05F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{12345E87-4C47-4857-B7E4-6673D6ECC05F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12345E87-4C47-4857-B7E4-6673D6ECC05F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7CD348F-E10F-4FBF-82C7-89C4AE971C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7CD348F-E10F-4FBF-82C7-89C4AE971C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7CD348F-E10F-4FBF-82C7-89C4AE971C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7CD348F-E10F-4FBF-82C7-89C4AE971C8F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -64,14 +70,15 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5AC30FC5-0E64-4C71-AD80-FE758709E22B} = {8B6D53E6-8F7B-47D1-B6D7-890A783A9959}
-		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1} = {8B6D53E6-8F7B-47D1-B6D7-890A783A9959}
-		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB}
-		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB}
-		{12345E87-4C47-4857-B7E4-6673D6ECC05F} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB}
-		{6C660B52-0FE3-43B9-838E-2F92B34E97D9} = {4562CA8C-1A07-4AFB-B5BC-977FD19605CB}
-		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD} = {A253B72C-7AA0-416A-92E6-09D5DCF906E7}
-		{29991657-E677-42A4-894C-6BE781C51DD7} = {A253B72C-7AA0-416A-92E6-09D5DCF906E7}
+		{5AC30FC5-0E64-4C71-AD80-FE758709E22B} = {C7E70291-2F6D-4258-8A73-2B71E3722537}
+		{E7CD348F-E10F-4FBF-82C7-89C4AE971C8F} = {C7E70291-2F6D-4258-8A73-2B71E3722537}
+		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1} = {C7E70291-2F6D-4258-8A73-2B71E3722537}
+		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA} = {78B48B8F-9235-4AFD-B97C-FAE3EE5B5C92}
+		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4} = {78B48B8F-9235-4AFD-B97C-FAE3EE5B5C92}
+		{12345E87-4C47-4857-B7E4-6673D6ECC05F} = {78B48B8F-9235-4AFD-B97C-FAE3EE5B5C92}
+		{6C660B52-0FE3-43B9-838E-2F92B34E97D9} = {78B48B8F-9235-4AFD-B97C-FAE3EE5B5C92}
+		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD} = {583D2800-0B5D-4344-AA9F-140BD538B8FD}
+		{29991657-E677-42A4-894C-6BE781C51DD7} = {583D2800-0B5D-4344-AA9F-140BD538B8FD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46980D07-0EA0-4C0F-BCB8-C9557CE69B51}
diff --git a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
index 0f2b0e0300ee40..caed784b962775 100644
--- a/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
+++ b/src/libraries/System.Security.Cryptography.Pkcs/System.Security.Cryptography.Pkcs.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6F930741-A5ED-401E-ABEE-77BEA461D9A5}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{5C28FE78-CCF4-4886-BD4D-23C749A46171}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3DAFB198-0B50-4F31-A3A9-3826042431F5}"
@@ -15,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs.Tests", "tests\System.Security.Cryptography.Pkcs.Tests.csproj", "{2C8C1360-AC50-4493-BC0B-950149A875A3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FD768C8B-9BF1-4F02-A2C4-335B22615763}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8171E098-1750-4B12-ADF3-721FF7E78636}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{893263F9-1E6A-4C9A-808D-539C399848CF}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1482F414-BE5B-493B-96CE-347F34A5CEC3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5B768A4-9BA9-4E78-B735-60052C68035C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7E7A48A5-D697-4280-A3D2-41286EE3E04D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -55,6 +57,10 @@ Global
 		{DA204355-86E3-431D-B08E-483A49BEB3DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA204355-86E3-431D-B08E-483A49BEB3DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA204355-86E3-431D-B08E-483A49BEB3DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C28FE78-CCF4-4886-BD4D-23C749A46171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C28FE78-CCF4-4886-BD4D-23C749A46171}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C28FE78-CCF4-4886-BD4D-23C749A46171}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C28FE78-CCF4-4886-BD4D-23C749A46171}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3DAFB198-0B50-4F31-A3A9-3826042431F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3DAFB198-0B50-4F31-A3A9-3826042431F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3DAFB198-0B50-4F31-A3A9-3826042431F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -64,14 +70,15 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91} = {FD768C8B-9BF1-4F02-A2C4-335B22615763}
-		{3DAFB198-0B50-4F31-A3A9-3826042431F5} = {FD768C8B-9BF1-4F02-A2C4-335B22615763}
-		{2C8C1360-AC50-4493-BC0B-950149A875A3} = {893263F9-1E6A-4C9A-808D-539C399848CF}
-		{6F930741-A5ED-401E-ABEE-77BEA461D9A5} = {893263F9-1E6A-4C9A-808D-539C399848CF}
-		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
-		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
-		{906CF937-8BCE-4ABF-B35C-23D51D59232E} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
-		{DA204355-86E3-431D-B08E-483A49BEB3DB} = {D5B768A4-9BA9-4E78-B735-60052C68035C}
+		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91} = {8171E098-1750-4B12-ADF3-721FF7E78636}
+		{5C28FE78-CCF4-4886-BD4D-23C749A46171} = {8171E098-1750-4B12-ADF3-721FF7E78636}
+		{3DAFB198-0B50-4F31-A3A9-3826042431F5} = {8171E098-1750-4B12-ADF3-721FF7E78636}
+		{2C8C1360-AC50-4493-BC0B-950149A875A3} = {1482F414-BE5B-493B-96CE-347F34A5CEC3}
+		{6F930741-A5ED-401E-ABEE-77BEA461D9A5} = {1482F414-BE5B-493B-96CE-347F34A5CEC3}
+		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2} = {7E7A48A5-D697-4280-A3D2-41286EE3E04D}
+		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {7E7A48A5-D697-4280-A3D2-41286EE3E04D}
+		{906CF937-8BCE-4ABF-B35C-23D51D59232E} = {7E7A48A5-D697-4280-A3D2-41286EE3E04D}
+		{DA204355-86E3-431D-B08E-483A49BEB3DB} = {7E7A48A5-D697-4280-A3D2-41286EE3E04D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CF4AD1E7-1B60-4FDF-894F-7F0EF613012B}
diff --git a/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln b/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
index d97ca35e9de011..0f2418b0c8b597 100644
--- a/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
+++ b/src/libraries/System.Security.Cryptography.X509Certificates/System.Security.Cryptography.X509Certificates.sln
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FC10D700-60DF-4D00-9433-47DFC3E3DC26}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{DD4F3952-502C-4FA6-B733-03C6F0E15BB5}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{C2D74126-653E-41C9-9CF8-E58F1FD110B8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{201E349A-1CC7-4591-8332-29BEBF3DAA49}"
@@ -21,11 +23,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.X509Certificates.Tests", "tests\System.Security.Cryptography.X509Certificates.Tests.csproj", "{53F1E058-B5A4-4348-9BE6-8B006A6861AF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C79093E1-DEC3-4A35-93CB-216D1E87ACDD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CB28423D-B08A-4D95-8E05-D62BE5000ACC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E5625DC8-6D89-4C9C-9AF6-35D0FAE7E4A5}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4236EC98-66F5-4D36-AE8B-A54B3E361801}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,14 +39,14 @@ Global
 		{4EC57148-D181-49B9-BDAF-1735D4687C79}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4EC57148-D181-49B9-BDAF-1735D4687C79}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4EC57148-D181-49B9-BDAF-1735D4687C79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A203F48-05D2-4E45-8A98-98F02EE639A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A203F48-05D2-4E45-8A98-98F02EE639A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A203F48-05D2-4E45-8A98-98F02EE639A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A203F48-05D2-4E45-8A98-98F02EE639A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53F1E058-B5A4-4348-9BE6-8B006A6861AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FC10D700-60DF-4D00-9433-47DFC3E3DC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FC10D700-60DF-4D00-9433-47DFC3E3DC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC10D700-60DF-4D00-9433-47DFC3E3DC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -53,14 +55,14 @@ Global
 		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Release|Any CPU.Build.0 = Release|Any CPU
 		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76812DB0-A6A2-4F0C-B560-18FC7A97E419}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -73,6 +75,10 @@ Global
 		{52FC346D-2936-43FD-93A6-02F019A5F5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52FC346D-2936-43FD-93A6-02F019A5F5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52FC346D-2936-43FD-93A6-02F019A5F5EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD4F3952-502C-4FA6-B733-03C6F0E15BB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD4F3952-502C-4FA6-B733-03C6F0E15BB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD4F3952-502C-4FA6-B733-03C6F0E15BB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD4F3952-502C-4FA6-B733-03C6F0E15BB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{201E349A-1CC7-4591-8332-29BEBF3DAA49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{201E349A-1CC7-4591-8332-29BEBF3DAA49}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{201E349A-1CC7-4591-8332-29BEBF3DAA49}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -82,17 +88,18 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{4EC57148-D181-49B9-BDAF-1735D4687C79} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD}
-		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD}
-		{201E349A-1CC7-4591-8332-29BEBF3DAA49} = {C79093E1-DEC3-4A35-93CB-216D1E87ACDD}
-		{53F1E058-B5A4-4348-9BE6-8B006A6861AF} = {E5625DC8-6D89-4C9C-9AF6-35D0FAE7E4A5}
-		{FC10D700-60DF-4D00-9433-47DFC3E3DC26} = {E5625DC8-6D89-4C9C-9AF6-35D0FAE7E4A5}
-		{2A203F48-05D2-4E45-8A98-98F02EE639A8} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
-		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
-		{76812DB0-A6A2-4F0C-B560-18FC7A97E419} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
-		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
-		{C2D74126-653E-41C9-9CF8-E58F1FD110B8} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
-		{52FC346D-2936-43FD-93A6-02F019A5F5EC} = {D171D0CF-B04B-4D8A-A678-7BB41E4A96FD}
+		{4EC57148-D181-49B9-BDAF-1735D4687C79} = {CB28423D-B08A-4D95-8E05-D62BE5000ACC}
+		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5} = {CB28423D-B08A-4D95-8E05-D62BE5000ACC}
+		{DD4F3952-502C-4FA6-B733-03C6F0E15BB5} = {CB28423D-B08A-4D95-8E05-D62BE5000ACC}
+		{201E349A-1CC7-4591-8332-29BEBF3DAA49} = {CB28423D-B08A-4D95-8E05-D62BE5000ACC}
+		{2A203F48-05D2-4E45-8A98-98F02EE639A8} = {DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}
+		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357} = {DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}
+		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD} = {DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}
+		{76812DB0-A6A2-4F0C-B560-18FC7A97E419} = {DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}
+		{C2D74126-653E-41C9-9CF8-E58F1FD110B8} = {DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}
+		{52FC346D-2936-43FD-93A6-02F019A5F5EC} = {DF6E2E14-AB0B-4500-B26B-5416F20CB4E8}
+		{53F1E058-B5A4-4348-9BE6-8B006A6861AF} = {4236EC98-66F5-4D36-AE8B-A54B3E361801}
+		{FC10D700-60DF-4D00-9433-47DFC3E3DC26} = {4236EC98-66F5-4D36-AE8B-A54B3E361801}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5ED3739E-C629-4900-BC1B-DF714AB4BB45}
diff --git a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
index 5a798bb4b28418..f2506aa1f01294 100644
--- a/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
+++ b/src/libraries/System.Security.Cryptography.Xml/System.Security.Cryptography.Xml.sln
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{737DC738-86E3-4528-B7B5-6DB9981A8A7A}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\ref\System.Formats.Asn1.csproj", "{E8E7A8AC-A27F-43CC-B596-2FC4C051E5BE}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FB3C7609-962F-4414-8702-B3D4121AC51B}"
@@ -35,11 +37,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{404253AC-EAFF-488F-8980-2249F4703278}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B8C68464-1D28-4889-90BC-BC80B036B90B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E709307A-885E-4A86-A8C8-1A15D6F3EF44}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F25E8B4D-D7E9-4086-A263-CB9D3B41074B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BA579BFF-D4D9-455A-A8AC-589361391420}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{72CBDEA9-C5AC-44AE-9531-0118B536C3CE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,30 +53,30 @@ Global
 		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Release|Any CPU.Build.0 = Release|Any CPU
 		{848640EF-9F7D-4D01-AA87-E16617FDEE0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{848640EF-9F7D-4D01-AA87-E16617FDEE0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{848640EF-9F7D-4D01-AA87-E16617FDEE0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{848640EF-9F7D-4D01-AA87-E16617FDEE0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42320794-D862-4CD4-9D67-F667A8820AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42320794-D862-4CD4-9D67-F667A8820AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42320794-D862-4CD4-9D67-F667A8820AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42320794-D862-4CD4-9D67-F667A8820AA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{675D4EE3-1F0E-4445-A9CD-635ED3351751}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42320794-D862-4CD4-9D67-F667A8820AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42320794-D862-4CD4-9D67-F667A8820AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42320794-D862-4CD4-9D67-F667A8820AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42320794-D862-4CD4-9D67-F667A8820AA6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{474CEFD4-533F-4A2E-8CF9-860F388BC332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{474CEFD4-533F-4A2E-8CF9-860F388BC332}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{474CEFD4-533F-4A2E-8CF9-860F388BC332}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{474CEFD4-533F-4A2E-8CF9-860F388BC332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B52971E5-EABD-4BE9-942A-EDAA290DB09B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{158DDF64-D678-492E-A38A-0EE12E096F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{158DDF64-D678-492E-A38A-0EE12E096F84}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{158DDF64-D678-492E-A38A-0EE12E096F84}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -83,10 +85,6 @@ Global
 		{28200C76-F42D-4E11-B948-C8D9193A58A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{28200C76-F42D-4E11-B948-C8D9193A58A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{28200C76-F42D-4E11-B948-C8D9193A58A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{404253AC-EAFF-488F-8980-2249F4703278}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{404253AC-EAFF-488F-8980-2249F4703278}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{404253AC-EAFF-488F-8980-2249F4703278}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,18 +93,26 @@ Global
 		{18882345-4F75-42DB-8DC9-A38AD5C4785E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{18882345-4F75-42DB-8DC9-A38AD5C4785E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18882345-4F75-42DB-8DC9-A38AD5C4785E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB3C7609-962F-4414-8702-B3D4121AC51B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB3C7609-962F-4414-8702-B3D4121AC51B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB3C7609-962F-4414-8702-B3D4121AC51B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB3C7609-962F-4414-8702-B3D4121AC51B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2034D74-55F1-4055-AC85-12F80A7E56CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2034D74-55F1-4055-AC85-12F80A7E56CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2034D74-55F1-4055-AC85-12F80A7E56CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2034D74-55F1-4055-AC85-12F80A7E56CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8E7A8AC-A27F-43CC-B596-2FC4C051E5BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8E7A8AC-A27F-43CC-B596-2FC4C051E5BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8E7A8AC-A27F-43CC-B596-2FC4C051E5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8E7A8AC-A27F-43CC-B596-2FC4C051E5BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{737DC738-86E3-4528-B7B5-6DB9981A8A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{737DC738-86E3-4528-B7B5-6DB9981A8A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{737DC738-86E3-4528-B7B5-6DB9981A8A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,24 +130,25 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{42320794-D862-4CD4-9D67-F667A8820AA6} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{28200C76-F42D-4E11-B948-C8D9193A58A1} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{18882345-4F75-42DB-8DC9-A38AD5C4785E} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{FB3C7609-962F-4414-8702-B3D4121AC51B} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{F2034D74-55F1-4055-AC85-12F80A7E56CD} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{6893D05F-56C1-4454-B3C8-DF83B2791C62} = {B8C68464-1D28-4889-90BC-BC80B036B90B}
-		{675D4EE3-1F0E-4445-A9CD-635ED3351751} = {F25E8B4D-D7E9-4086-A263-CB9D3B41074B}
-		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77} = {F25E8B4D-D7E9-4086-A263-CB9D3B41074B}
-		{848640EF-9F7D-4D01-AA87-E16617FDEE0B} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{B52971E5-EABD-4BE9-942A-EDAA290DB09B} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{474CEFD4-533F-4A2E-8CF9-860F388BC332} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{158DDF64-D678-492E-A38A-0EE12E096F84} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{404253AC-EAFF-488F-8980-2249F4703278} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{737DC738-86E3-4528-B7B5-6DB9981A8A7A} = {BA579BFF-D4D9-455A-A8AC-589361391420}
-		{013A3141-8CCB-477A-B4B2-A5A5F2CC7603} = {BA579BFF-D4D9-455A-A8AC-589361391420}
+		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{42320794-D862-4CD4-9D67-F667A8820AA6} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{28200C76-F42D-4E11-B948-C8D9193A58A1} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{18882345-4F75-42DB-8DC9-A38AD5C4785E} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{FB3C7609-962F-4414-8702-B3D4121AC51B} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{F2034D74-55F1-4055-AC85-12F80A7E56CD} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{E8E7A8AC-A27F-43CC-B596-2FC4C051E5BE} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{6893D05F-56C1-4454-B3C8-DF83B2791C62} = {E709307A-885E-4A86-A8C8-1A15D6F3EF44}
+		{848640EF-9F7D-4D01-AA87-E16617FDEE0B} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{474CEFD4-533F-4A2E-8CF9-860F388BC332} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{B52971E5-EABD-4BE9-942A-EDAA290DB09B} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{158DDF64-D678-492E-A38A-0EE12E096F84} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{404253AC-EAFF-488F-8980-2249F4703278} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{4412A97C-77C7-4C89-8F78-E26AEEDE8CA8} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{F9447DA1-7699-4B6E-B1D2-6D8F74B82EE3} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{737DC738-86E3-4528-B7B5-6DB9981A8A7A} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{013A3141-8CCB-477A-B4B2-A5A5F2CC7603} = {B1FC6C78-819D-4CC5-A7D2-B9E26E79EDAF}
+		{675D4EE3-1F0E-4445-A9CD-635ED3351751} = {72CBDEA9-C5AC-44AE-9531-0118B536C3CE}
+		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77} = {72CBDEA9-C5AC-44AE-9531-0118B536C3CE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E0287BE2-B499-4885-8EE8-0B35585CA885}
diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln
index 0d450df5fa6281..2a96ae95fc2a76 100644
--- a/src/libraries/System.Text.Json/System.Text.Json.sln
+++ b/src/libraries/System.Text.Json/System.Text.Json.sln
@@ -5,6 +5,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\ref\System.Collections.Immutable.csproj", "{C4E84437-6731-4532-A618-03A60D674DBB}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{1C8262DB-7355-40A8-A2EC-4EED7363134A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\ref\System.IO.Pipelines.csproj", "{4774F56D-16A8-4ABB-8C73-5F57609F1773}"
@@ -15,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServ
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7909EB27-0D6E-46E6-B9F9-8A1EFD557018}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\ref\System.Text.Encodings.Web.csproj", "{B44CFC98-9CE0-448C-8E30-F52DB80617E8}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "..\System.Text.Encodings.Web\src\System.Text.Encodings.Web.csproj", "{9BCCDA15-8907-4AE3-8871-2F17775DDE4C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGeneration", "gen\System.Text.Json.SourceGeneration.csproj", "{6485EED4-C313-4551-9865-8ADCED603629}"
@@ -29,11 +33,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.SourceGene
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.Tests", "tests\System.Text.Json.Tests\System.Text.Json.Tests.csproj", "{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E07C6980-EB71-4D19-A80A-7BEB80B635B1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7328669F-9A65-49D3-A2E6-BC91E1936225}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0371C5D8-D5F5-4747-9810-D91D71D8C0E4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{56782B59-D4BE-4809-A99C-D736A0D8FD0C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E49881A9-09F6-442F-9E1D-6D87F5F837F1}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{96FFC990-4E83-41B0-8A41-6E38F6E9588E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,46 +45,38 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7015E94D-D20D-48C8-86D7-6A996BE99E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7015E94D-D20D-48C8-86D7-6A996BE99E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7015E94D-D20D-48C8-86D7-6A996BE99E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7015E94D-D20D-48C8-86D7-6A996BE99E0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33599A6C-F340-4E1B-9B4D-CB8946C22140}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1285FF43-F491-4BE0-B92C-37DA689CBD4B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5720BF06-2031-4AD8-B9B4-31A01E27ABB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73D5739C-E382-4E22-A7D3-B82705C58C74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73D5739C-E382-4E22-A7D3-B82705C58C74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73D5739C-E382-4E22-A7D3-B82705C58C74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73D5739C-E382-4E22-A7D3-B82705C58C74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6485EED4-C313-4551-9865-8ADCED603629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6485EED4-C313-4551-9865-8ADCED603629}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6485EED4-C313-4551-9865-8ADCED603629}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6485EED4-C313-4551-9865-8ADCED603629}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B44CFC98-9CE0-448C-8E30-F52DB80617E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B44CFC98-9CE0-448C-8E30-F52DB80617E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B44CFC98-9CE0-448C-8E30-F52DB80617E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B44CFC98-9CE0-448C-8E30-F52DB80617E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{102945CA-3736-4B2C-8E68-242A0B247F2B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -93,34 +89,52 @@ Global
 		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6485EED4-C313-4551-9865-8ADCED603629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6485EED4-C313-4551-9865-8ADCED603629}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6485EED4-C313-4551-9865-8ADCED603629}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6485EED4-C313-4551-9865-8ADCED603629}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C8262DB-7355-40A8-A2EC-4EED7363134A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E2077991-EB83-471C-B17F-72F569FFCE6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2077991-EB83-471C-B17F-72F569FFCE6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E2077991-EB83-471C-B17F-72F569FFCE6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2077991-EB83-471C-B17F-72F569FFCE6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4774F56D-16A8-4ABB-8C73-5F57609F1773}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4E84437-6731-4532-A618-03A60D674DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4E84437-6731-4532-A618-03A60D674DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4E84437-6731-4532-A618-03A60D674DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4E84437-6731-4532-A618-03A60D674DBB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{33599A6C-F340-4E1B-9B4D-CB8946C22140} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1}
-		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1}
-		{5720BF06-2031-4AD8-B9B4-31A01E27ABB8} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1}
-		{102945CA-3736-4B2C-8E68-242A0B247F2B} = {E07C6980-EB71-4D19-A80A-7BEB80B635B1}
-		{7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4}
-		{73D5739C-E382-4E22-A7D3-B82705C58C74} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4}
-		{4774F56D-16A8-4ABB-8C73-5F57609F1773} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4}
-		{E2077991-EB83-471C-B17F-72F569FFCE6D} = {0371C5D8-D5F5-4747-9810-D91D71D8C0E4}
-		{1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
-		{6485EED4-C313-4551-9865-8ADCED603629} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
-		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
-		{1C8262DB-7355-40A8-A2EC-4EED7363134A} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
-		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
-		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
-		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {E49881A9-09F6-442F-9E1D-6D87F5F837F1}
+		{1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{6485EED4-C313-4551-9865-8ADCED603629} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{1C8262DB-7355-40A8-A2EC-4EED7363134A} = {7328669F-9A65-49D3-A2E6-BC91E1936225}
+		{7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {56782B59-D4BE-4809-A99C-D736A0D8FD0C}
+		{73D5739C-E382-4E22-A7D3-B82705C58C74} = {56782B59-D4BE-4809-A99C-D736A0D8FD0C}
+		{B44CFC98-9CE0-448C-8E30-F52DB80617E8} = {56782B59-D4BE-4809-A99C-D736A0D8FD0C}
+		{E2077991-EB83-471C-B17F-72F569FFCE6D} = {56782B59-D4BE-4809-A99C-D736A0D8FD0C}
+		{4774F56D-16A8-4ABB-8C73-5F57609F1773} = {56782B59-D4BE-4809-A99C-D736A0D8FD0C}
+		{C4E84437-6731-4532-A618-03A60D674DBB} = {56782B59-D4BE-4809-A99C-D736A0D8FD0C}
+		{33599A6C-F340-4E1B-9B4D-CB8946C22140} = {96FFC990-4E83-41B0-8A41-6E38F6E9588E}
+		{A0178BAA-A1AF-4C69-8E4A-A700A2723DDC} = {96FFC990-4E83-41B0-8A41-6E38F6E9588E}
+		{5720BF06-2031-4AD8-B9B4-31A01E27ABB8} = {96FFC990-4E83-41B0-8A41-6E38F6E9588E}
+		{102945CA-3736-4B2C-8E68-242A0B247F2B} = {96FFC990-4E83-41B0-8A41-6E38F6E9588E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5868B757-D821-41FC-952E-2113A0519506}