From ed295782bf90088416ff5cc94a91cf20d92be900 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 17 Nov 2020 18:23:30 +0100
Subject: [PATCH] Add workflow to update solution files with SlnGen and update
 them initially (#44703)

* Add slngen infra

* Update all solution files
---
 .config/dotnet-tools.json                     |    8 +-
 eng/slngen.targets                            |   13 +
 .../System.Private.CoreLib.csproj             |    1 +
 src/libraries/Common/Common.Tests.sln         |   81 +-
 .../Directory.Build.targets                   |    2 -
 .../StaticTestGenerator.csproj                |    3 +-
 src/libraries/Directory.Build.targets         |    1 +
 .../Microsoft.Bcl.AsyncInterfaces.sln         |   99 +-
 .../Microsoft.CSharp/Microsoft.CSharp.sln     |  104 +-
 ...Diagnostics.Tracing.EventSource.Redist.sln |   89 +-
 ...rosoft.Extensions.Caching.Abstractions.sln |   68 +-
 .../Microsoft.Extensions.Caching.Memory.sln   |  199 ++-
 ....Extensions.Configuration.Abstractions.sln |   68 +-
 ...rosoft.Extensions.Configuration.Binder.sln |  157 ++-
 ...t.Extensions.Configuration.CommandLine.sln |  171 ++-
 ...ons.Configuration.EnvironmentVariables.sln |  171 ++-
 ...xtensions.Configuration.FileExtensions.sln |  185 ++-
 ...Microsoft.Extensions.Configuration.Ini.sln |  213 +++-
 ...icrosoft.Extensions.Configuration.Json.sln |  241 +++-
 ...t.Extensions.Configuration.UserSecrets.sln |  241 +++-
 ...Microsoft.Extensions.Configuration.Xml.sln |  276 ++++-
 .../Microsoft.Extensions.Configuration.sln    |  387 +++++-
 ...sions.DependencyInjection.Abstractions.sln |   40 +-
 ...crosoft.Extensions.DependencyInjection.sln |  141 ++-
 .../Microsoft.Extensions.DependencyModel.sln  |  175 +--
 ....Extensions.FileProviders.Abstractions.sln |   68 +-
 ...oft.Extensions.FileProviders.Composite.sln |  129 +-
 ...soft.Extensions.FileProviders.Physical.sln |  143 ++-
 ...icrosoft.Extensions.FileSystemGlobbing.sln |   98 +-
 ...rosoft.Extensions.Hosting.Abstractions.sln |  131 +-
 .../Microsoft.Extensions.Hosting.sln          |  600 ++++++++-
 .../Microsoft.Extensions.Http.sln             |  206 +++-
 ...rosoft.Extensions.Logging.Abstractions.sln |   40 +-
 ...osoft.Extensions.Logging.Configuration.sln |  215 +++-
 .../Microsoft.Extensions.Logging.Console.sln  |  285 ++++-
 .../Microsoft.Extensions.Logging.Debug.sln    |  159 ++-
 .../Microsoft.Extensions.Logging.EventLog.sln |  264 +++-
 ...crosoft.Extensions.Logging.EventSource.sln |  220 +++-
 ...crosoft.Extensions.Logging.TraceSource.sln |  159 ++-
 .../Microsoft.Extensions.Logging.sln          |  507 +++++++-
 ...nsions.Options.ConfigurationExtensions.sln |  228 +++-
 ...oft.Extensions.Options.DataAnnotations.sln |  103 +-
 .../Microsoft.Extensions.Options.sln          |  234 +++-
 .../Microsoft.Extensions.Primitives.sln       |   98 +-
 .../Microsoft.IO.Redist.sln                   |   41 +-
 .../Microsoft.VisualBasic.Core.sln            |  181 ++-
 .../Microsoft.Win32.Primitives.sln            |  104 +-
 ...Microsoft.Win32.Registry.AccessControl.sln |  174 ++-
 .../Microsoft.Win32.Registry.sln              |  160 ++-
 .../Microsoft.Win32.SystemEvents.sln          |  104 +-
 .../Microsoft.XmlSerializer.Generator.sln     |  100 +-
 .../System.AppContext/System.AppContext.sln   |  231 +++-
 .../System.Buffers/System.Buffers.sln         |  231 +++-
 .../System.CodeDom/System.CodeDom.sln         |  125 +-
 .../System.Collections.Concurrent.sln         |  295 ++++-
 .../System.Collections.Immutable.sln          |  104 +-
 .../System.Collections.NonGeneric.sln         |  104 +-
 .../System.Collections.Specialized.sln        |  104 +-
 .../System.Collections/System.Collections.sln |  236 +++-
 .../System.ComponentModel.Annotations.sln     |  104 +-
 ...omponentModel.Composition.Registration.sln |  132 +-
 .../System.ComponentModel.Composition.sln     |  119 +-
 .../System.ComponentModel.EventBasedAsync.sln |  104 +-
 .../System.ComponentModel.Primitives.sln      |  104 +-
 .../System.ComponentModel.TypeConverter.sln   |  104 +-
 .../System.ComponentModel.sln                 |  104 +-
 .../System.Composition.AttributedModel.sln    |  103 +-
 .../System.Composition.Convention.sln         |  117 +-
 .../System.Composition.Hosting.sln            |   96 +-
 .../System.Composition.Runtime.sln            |   89 +-
 .../System.Composition.TypedParts.sln         |  117 +-
 .../System.Composition/System.Composition.sln |  133 +-
 ...tem.Configuration.ConfigurationManager.sln |  167 ++-
 .../System.Console/System.Console.sln         |  126 +-
 .../System.Data.Common/System.Data.Common.sln |  339 +++++-
 .../System.Data.DataSetExtensions.sln         |  104 +-
 .../System.Data.Odbc/System.Data.Odbc.sln     |  111 +-
 .../System.Data.OleDb/System.Data.Oledb.sln   |  216 +++-
 .../System.Diagnostics.Contracts.sln          |  231 +++-
 .../System.Diagnostics.Debug.sln              |  285 ++++-
 .../System.Diagnostics.DiagnosticSource.sln   |  111 +-
 .../System.Diagnostics.EventLog.sln           |  181 ++-
 .../System.Diagnostics.FileVersionInfo.sln    |  148 +--
 .../System.Diagnostics.PerformanceCounter.sln |  202 ++-
 .../System.Diagnostics.Process.sln            |  188 ++-
 .../System.Diagnostics.StackTrace.sln         |  423 +++++--
 ...em.Diagnostics.TextWriterTraceListener.sln |  104 +-
 .../System.Diagnostics.Tools.sln              |  231 +++-
 .../System.Diagnostics.TraceSource.sln        |  425 +++++--
 .../System.Diagnostics.Tracing.sln            |  231 +++-
 ...em.DirectoryServices.AccountManagement.sln |  223 +++-
 .../System.DirectoryServices.Protocols.sln    |  181 ++-
 .../System.DirectoryServices.sln              |  167 ++-
 .../System.Drawing.Common.sln                 |  118 +-
 .../System.Drawing.Primitives.sln             |  118 +-
 .../System.Dynamic.Runtime.sln                |  104 +-
 .../System.Formats.Asn1.sln                   |  115 +-
 .../System.Formats.Cbor.sln                   |  107 +-
 .../System.Globalization.Calendars.sln        |  257 +++-
 .../System.Globalization.Extensions.sln       |  122 +-
 .../System.Globalization.sln                  |  306 ++++-
 .../System.IO.Compression.Brotli.sln          |  104 +-
 .../System.IO.Compression.ZipFile.sln         |  104 +-
 .../System.IO.Compression.sln                 |  104 +-
 .../System.IO.FileSystem.AccessControl.sln    |  167 ++-
 .../System.IO.FileSystem.DriveInfo.sln        |  104 +-
 .../System.IO.FileSystem.Primitives.sln       |  104 +-
 .../System.IO.FileSystem.Watcher.sln          |  104 +-
 .../System.IO.FileSystem.sln                  |  115 +-
 .../System.IO.IsolatedStorage.sln             |  181 ++-
 .../System.IO.MemoryMappedFiles.sln           |  104 +-
 .../System.IO.Packaging.sln                   |  104 +-
 .../System.IO.Pipelines.sln                   |  104 +-
 .../System.IO.Pipes.AccessControl.sln         |  135 ++-
 .../System.IO.Pipes/System.IO.Pipes.sln       |  237 +++-
 .../System.IO.Ports/System.IO.Ports.sln       |  181 ++-
 .../System.IO.UnmanagedMemoryStream.sln       |  231 +++-
 src/libraries/System.IO/System.IO.sln         |  104 +-
 .../System.Linq.Expressions.sln               |  104 +-
 .../System.Linq.Parallel.sln                  |  104 +-
 .../System.Linq.Queryable.sln                 |  104 +-
 src/libraries/System.Linq/System.Linq.sln     |  104 +-
 .../System.Management/System.Management.sln   |  188 ++-
 src/libraries/System.Memory/System.Memory.sln |  231 +++-
 .../System.Net.Connections.sln                |  112 +-
 .../System.Net.Http.Json.sln                  |  144 ++-
 .../System.Net.Http.WinHttpHandler.sln        |  175 ++-
 .../System.Net.Http/System.Net.Http.sln       |  175 ++-
 .../System.Net.HttpListener.sln               |  111 +-
 .../System.Net.Mail/System.Net.Mail.sln       |  126 +-
 .../System.Net.NameResolution.sln             |  141 ++-
 .../System.Net.NetworkInformation.sln         |  104 +-
 .../System.Net.Ping/System.Net.Ping.sln       |  104 +-
 .../System.Net.Primitives.sln                 |  134 +-
 .../System.Net.Quic/System.Net.Quic.sln       |   99 +-
 .../System.Net.Requests.sln                   |  111 +-
 .../System.Net.Security.sln                   |  154 ++-
 .../System.Net.ServicePoint.sln               |  104 +-
 .../System.Net.Sockets/System.Net.Sockets.sln |  111 +-
 .../System.Net.WebClient.sln                  |  104 +-
 .../System.Net.WebHeaderCollection.sln        |  104 +-
 .../System.Net.WebProxy.sln                   |  104 +-
 .../System.Net.WebSockets.Client.sln          |  111 +-
 ...ystem.Net.WebSockets.WebSocketProtocol.sln |  104 +-
 .../System.Net.WebSockets.sln                 |  104 +-
 .../System.Numerics.Tensors.sln               |  104 +-
 .../System.Numerics.Vectors.sln               |  231 +++-
 .../System.ObjectModel/System.ObjectModel.sln |  104 +-
 ...stem.Private.DataContractSerialization.sln |   25 +-
 ...ate.Runtime.InteropServices.JavaScript.sln |  104 +-
 .../System.Private.Uri/System.Private.Uri.sln |  262 +++-
 .../System.Private.Xml.Linq.sln               |  336 ++---
 .../System.Private.Xml/System.Private.Xml.sln |  584 +++++----
 .../System.Reflection.Context.sln             |  104 +-
 .../System.Reflection.DispatchProxy.sln       |  104 +-
 .../System.Reflection.Emit.ILGeneration.sln   |  231 +++-
 .../System.Reflection.Emit.Lightweight.sln    |  231 +++-
 .../System.Reflection.Emit.sln                |  231 +++-
 .../System.Reflection.Extensions.sln          |  104 +-
 .../System.Reflection.Metadata.sln            |  116 +-
 .../System.Reflection.MetadataLoadContext.sln |  118 +-
 .../System.Reflection.Primitives.sln          |   92 +-
 .../System.Reflection.TypeExtensions.sln      |  239 +++-
 .../System.Reflection/System.Reflection.sln   |  691 +++++++----
 .../System.Resources.Extensions.sln           |  139 ++-
 .../System.Resources.Reader.sln               |  104 +-
 .../System.Resources.ResourceManager.sln      |  285 ++++-
 .../System.Resources.Writer.sln               |  104 +-
 .../System.Runtime.Caching.sln                |  181 ++-
 ...System.Runtime.CompilerServices.Unsafe.sln |   90 +-
 ...ystem.Runtime.CompilerServices.VisualC.sln |  104 +-
 .../System.Runtime.Extensions.sln             |  399 ++++--
 .../System.Runtime.Handles.sln                |  104 +-
 ...ime.InteropServices.RuntimeInformation.sln |  104 +-
 .../System.Runtime.InteropServices.sln        |  236 +++-
 .../System.Runtime.Intrinsics.sln             |   92 +-
 .../System.Runtime.Loader.sln                 |  531 +++++---
 .../System.Runtime.Numerics.sln               |  104 +-
 ...ystem.Runtime.Serialization.Formatters.sln | 1079 ++++++++++++++++-
 ...ystem.Runtime.Serialization.Formatters.sln |  Bin 0 -> 46616 bytes
 .../System.Runtime.Serialization.Json.sln     |  131 +-
 ...ystem.Runtime.Serialization.Primitives.sln |  104 +-
 .../System.Runtime.Serialization.Xml.sln      |  169 ++-
 .../System.Runtime/System.Runtime.sln         |  546 +++++++--
 .../System.Security.AccessControl.sln         |  118 +-
 .../System.Security.Claims.sln                |  104 +-
 ...ystem.Security.Cryptography.Algorithms.sln |  139 ++-
 .../System.Security.Cryptography.Cng.sln      |  118 +-
 .../System.Security.Cryptography.Csp.sln      |  125 +-
 .../System.Security.Cryptography.Encoding.sln |  104 +-
 .../System.Security.Cryptography.OpenSsl.sln  |  125 +-
 .../System.Security.Cryptography.Pkcs.sln     |  125 +-
 ...ystem.Security.Cryptography.Primitives.sln |  104 +-
 ...em.Security.Cryptography.ProtectedData.sln |  104 +-
 ...Security.Cryptography.X509Certificates.sln |  153 ++-
 .../System.Security.Cryptography.Xml.sln      |  153 ++-
 .../System.Security.Permissions.sln           |  167 ++-
 .../System.Security.Principal.Windows.sln     |   97 +-
 .../System.Security.Principal.sln             |   92 +-
 .../System.Security.SecureString.sln          |  104 +-
 .../System.ServiceModel.Syndication.sln       |  104 +-
 ...ystem.ServiceProcess.ServiceController.sln |  210 +++-
 .../System.Text.Encoding.CodePages.sln        |  104 +-
 .../System.Text.Encoding.Extensions.sln       |  231 +++-
 .../System.Text.Encoding.sln                  |  231 +++-
 .../System.Text.Encodings.Web.sln             |  104 +-
 .../System.Text.Json/System.Text.Json.sln     |  146 ++-
 .../System.Text.RegularExpressions.sln        |  104 +-
 .../System.Threading.AccessControl.sln        |  118 +-
 .../System.Threading.Channels.sln             |  104 +-
 .../System.Threading.Overlapped.sln           |  231 +++-
 .../System.Threading.Tasks.Dataflow.sln       |  104 +-
 .../System.Threading.Tasks.Extensions.sln     |  231 +++-
 .../System.Threading.Tasks.Parallel.sln       |  104 +-
 .../System.Threading.Tasks.sln                |  231 +++-
 .../System.Threading.Thread.sln               |  309 ++++-
 .../System.Threading.ThreadPool.sln           |  231 +++-
 .../System.Threading.Timer.sln                |  231 +++-
 .../System.Threading/System.Threading.sln     |  236 +++-
 .../System.Transactions.Local.sln             |  104 +-
 .../System.ValueTuple/System.ValueTuple.sln   |  104 +-
 .../System.Web.HttpUtility.sln                |  104 +-
 .../System.Windows.Extensions.sln             |  132 +-
 .../System.Xml.ReaderWriter.sln               |   54 +-
 .../System.Xml.XDocument.sln                  |   66 +-
 .../System.Xml.XPath.XDocument.sln            |   66 +-
 .../System.Xml.XPath/System.Xml.XPath.sln     |   54 +-
 .../System.Xml.XmlDocument.sln                |   54 +-
 .../System.Xml.XmlSerializer.sln              |   54 +-
 src/libraries/UpdateLibrariesSlns.ps1         |   24 +
 .../System.Private.CoreLib.csproj             |    1 +
 231 files changed, 27341 insertions(+), 9429 deletions(-)
 create mode 100644 eng/slngen.targets
 delete mode 100644 src/libraries/Common/tests/StaticTestGenerator/Directory.Build.targets
 create mode 100644 src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.sln
 create mode 100644 src/libraries/UpdateLibrariesSlns.ps1

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 1b785a2e6d6ad0..551fc37d6c4d0b 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -19,6 +19,12 @@
       "commands": [
         "xharness"
       ]
+    },
+    "microsoft.visualstudio.slngen.tool": {
+      "version": "4.4.0",
+      "commands": [
+        "slngen"
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/eng/slngen.targets b/eng/slngen.targets
new file mode 100644
index 00000000000000..39863abafb1e84
--- /dev/null
+++ b/eng/slngen.targets
@@ -0,0 +1,13 @@
+<Project>
+  <PropertyGroup>
+    <SlnGenSolutionFolder Condition="'$(IsReferenceAssembly)' == 'true'">ref</SlnGenSolutionFolder>
+    <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>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index 1b0204588a2f8a..4de4ac0aa58606 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -52,6 +52,7 @@
 
     <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes>
     <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
+    <SlnGenSolutionFolder>src</SlnGenSolutionFolder>
   </PropertyGroup>
 
   <!-- Platform specific properties -->
diff --git a/src/libraries/Common/Common.Tests.sln b/src/libraries/Common/Common.Tests.sln
index c1ef093cd7e71d..e0c55f3d47db2a 100644
--- a/src/libraries/Common/Common.Tests.sln
+++ b/src/libraries/Common/Common.Tests.sln
@@ -1,43 +1,72 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26430.13
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "tests\Common.Tests.csproj", "{C72FD34C-539A-4447-9796-62A229571199}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "tests\Common.Tests.csproj", "{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "tests\TestUtilities\TestUtilities.csproj", "{10215DC2-1255-4B60-B0AC-D8B09BCEA179}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "tests\TestUtilities\TestUtilities.csproj", "{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{782D1DD8-81D0-400A-98FA-BC9FD9C6EC6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Unicode", "tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{7AA91133-B0CB-4321-986B-323A7DED12C0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2141FEEA-0422-4319-B88D-DA15CBD77599}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3AAD1539-D958-4A4D-A563-F5B251BF3935}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{55D75024-D19D-4653-837A-D75DED03479C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{339EB701-0224-42BF-AC1A-2E39D52F9860}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CA3E0F1A-955A-458B-8F2B-C834E1106146}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C1469BA2-6053-4ADB-8856-0C674DD64397}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA} = {339EB701-0224-42BF-AC1A-2E39D52F9860}
+		{10215DC2-1255-4B60-B0AC-D8B09BCEA179} = {339EB701-0224-42BF-AC1A-2E39D52F9860}
+		{782D1DD8-81D0-400A-98FA-BC9FD9C6EC6A} = {CA3E0F1A-955A-458B-8F2B-C834E1106146}
+		{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC} = {CA3E0F1A-955A-458B-8F2B-C834E1106146}
+		{3AAD1539-D958-4A4D-A563-F5B251BF3935} = {CA3E0F1A-955A-458B-8F2B-C834E1106146}
+		{55D75024-D19D-4653-837A-D75DED03479C} = {CA3E0F1A-955A-458B-8F2B-C834E1106146}
+		{2141FEEA-0422-4319-B88D-DA15CBD77599} = {C1469BA2-6053-4ADB-8856-0C674DD64397}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C72FD34C-539A-4447-9796-62A229571199}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C72FD34C-539A-4447-9796-62A229571199}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AA91133-B0CB-4321-986B-323A7DED12C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{504E9212-C8FD-4147-8FB2-2A32AE1CD4EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10215DC2-1255-4B60-B0AC-D8B09BCEA179}.Release|Any CPU.Build.0 = Release|Any CPU
+		{782D1DD8-81D0-400A-98FA-BC9FD9C6EC6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{782D1DD8-81D0-400A-98FA-BC9FD9C6EC6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{782D1DD8-81D0-400A-98FA-BC9FD9C6EC6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{782D1DD8-81D0-400A-98FA-BC9FD9C6EC6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0A180C4-8292-45EE-A4B9-0A359BC9C2FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2141FEEA-0422-4319-B88D-DA15CBD77599}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2141FEEA-0422-4319-B88D-DA15CBD77599}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AAD1539-D958-4A4D-A563-F5B251BF3935}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AAD1539-D958-4A4D-A563-F5B251BF3935}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AAD1539-D958-4A4D-A563-F5B251BF3935}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AAD1539-D958-4A4D-A563-F5B251BF3935}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55D75024-D19D-4653-837A-D75DED03479C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55D75024-D19D-4653-837A-D75DED03479C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55D75024-D19D-4653-837A-D75DED03479C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55D75024-D19D-4653-837A-D75DED03479C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5E554AE7-CBC2-4C34-9FEA-1A6250CE5D3F}
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FE339F8D-E1DA-4F5D-9990-B4E270E20F5E} = {D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}
-		{7AA91133-B0CB-4321-986B-323A7DED12C0} = {D5C979E6-ED08-4CF6-A5B2-E646481EC3A4}
+		SolutionGuid = {4543E82B-8616-438A-B58B-EE47079D6956}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.targets b/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.targets
deleted file mode 100644
index 41245684e20523..00000000000000
--- a/src/libraries/Common/tests/StaticTestGenerator/Directory.Build.targets
+++ /dev/null
@@ -1,2 +0,0 @@
-<!-- Standalone project. Avoid being tied to the build infrastructure in the repo. -->
-<Project/>
\ No newline at end of file
diff --git a/src/libraries/Common/tests/StaticTestGenerator/StaticTestGenerator.csproj b/src/libraries/Common/tests/StaticTestGenerator/StaticTestGenerator.csproj
index 80026b950a5efe..b4107546efdd22 100644
--- a/src/libraries/Common/tests/StaticTestGenerator/StaticTestGenerator.csproj
+++ b/src/libraries/Common/tests/StaticTestGenerator/StaticTestGenerator.csproj
@@ -8,8 +8,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn />
     <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <PropertyGroup>
+    <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 16edbbd3475623..79ecbbd12250e6 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -124,6 +124,7 @@
   <Import Project="$(RepositoryEngineeringDir)testing\runtimeConfiguration.targets" />
   <Import Project="$(RepositoryEngineeringDir)testing\runsettings.targets" Condition="'$(EnableRunSettingsSupport)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableRunSettingsSupport)' == 'true' or '$(EnableCoverageSupport)' == 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)slngen.targets" />
 
   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
   <Import Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" Condition="'$(DisableProjectRestore)' == 'true'" />
diff --git a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
index 1f6586d8aa7929..028529bdefd351 100644
--- a/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
+++ b/src/libraries/Microsoft.Bcl.AsyncInterfaces/Microsoft.Bcl.AsyncInterfaces.sln
@@ -1,51 +1,86 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30120.7
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "src\Microsoft.Bcl.AsyncInterfaces.csproj", "{E6C08D1F-5DAC-470E-809D-42DBFAA56DD4}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8FA3CF3F-DF33-4DC4-A261-4642AB786838}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0C330C14-95F7-4AD3-9BD0-8AAB6E3013D8}"
-	ProjectSection(SolutionItems) = preProject
-		ref\Microsoft.Bcl.AsyncInterfaces.csproj = ref\Microsoft.Bcl.AsyncInterfaces.csproj
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4D4BED71-8904-4A74-88CD-63D002CCACD0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces.Tests", "tests\Microsoft.Bcl.AsyncInterfaces.Tests.csproj", "{857B2747-4D8E-4A0C-9C38-521F690ED28E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces.Tests", "tests\Microsoft.Bcl.AsyncInterfaces.Tests.csproj", "{51D9518A-464D-4257-9567-3BDCFF24F3EE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78938ED3-0E8A-451A-A508-0E724E471B91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0CC7688E-1DBE-4966-B1EB-2D6D29C23B8C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{95680D66-EE1B-4389-A84D-0C49AF570732}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{001573F8-5364-4087-B716-28993E03FFF6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E28342C8-A4CB-4282-9F3B-FE9FE8A0D94C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{14998387-412C-4723-B5CD-EEEB2B51DDC1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9B9A11F1-B6F4-496F-BA6B-583EA63C9E43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE764B31-3F63-43C7-917B-41D9515D072C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D} = {14998387-412C-4723-B5CD-EEEB2B51DDC1}
+		{51D9518A-464D-4257-9567-3BDCFF24F3EE} = {14998387-412C-4723-B5CD-EEEB2B51DDC1}
+		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE} = {9B9A11F1-B6F4-496F-BA6B-583EA63C9E43}
+		{0CC7688E-1DBE-4966-B1EB-2D6D29C23B8C} = {9B9A11F1-B6F4-496F-BA6B-583EA63C9E43}
+		{0D1C7DCB-970D-4099-AC9F-A01E75923EC6} = {9B9A11F1-B6F4-496F-BA6B-583EA63C9E43}
+		{001573F8-5364-4087-B716-28993E03FFF6} = {9B9A11F1-B6F4-496F-BA6B-583EA63C9E43}
+		{E28342C8-A4CB-4282-9F3B-FE9FE8A0D94C} = {9B9A11F1-B6F4-496F-BA6B-583EA63C9E43}
+		{4D4BED71-8904-4A74-88CD-63D002CCACD0} = {EE764B31-3F63-43C7-917B-41D9515D072C}
+		{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B} = {EE764B31-3F63-43C7-917B-41D9515D072C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E6C08D1F-5DAC-470E-809D-42DBFAA56DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6C08D1F-5DAC-470E-809D-42DBFAA56DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6C08D1F-5DAC-470E-809D-42DBFAA56DD4}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6C08D1F-5DAC-470E-809D-42DBFAA56DD4}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{857B2747-4D8E-4A0C-9C38-521F690ED28E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{857B2747-4D8E-4A0C-9C38-521F690ED28E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{857B2747-4D8E-4A0C-9C38-521F690ED28E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{857B2747-4D8E-4A0C-9C38-521F690ED28E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95680D66-EE1B-4389-A84D-0C49AF570732}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95680D66-EE1B-4389-A84D-0C49AF570732}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95680D66-EE1B-4389-A84D-0C49AF570732}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95680D66-EE1B-4389-A84D-0C49AF570732}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAEE0409-CCC3-4EA6-AB54-177FD305D42D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73E7C25C-AEBC-4F4F-B8D1-0CC49D5B92DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4D4BED71-8904-4A74-88CD-63D002CCACD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4D4BED71-8904-4A74-88CD-63D002CCACD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4D4BED71-8904-4A74-88CD-63D002CCACD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51D9518A-464D-4257-9567-3BDCFF24F3EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CC7688E-1DBE-4966-B1EB-2D6D29C23B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CC7688E-1DBE-4966-B1EB-2D6D29C23B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CC7688E-1DBE-4966-B1EB-2D6D29C23B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CC7688E-1DBE-4966-B1EB-2D6D29C23B8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D1C7DCB-970D-4099-AC9F-A01E75923EC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF838F1D-5C1C-472B-B31C-9A3B7507BB4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{001573F8-5364-4087-B716-28993E03FFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{001573F8-5364-4087-B716-28993E03FFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{001573F8-5364-4087-B716-28993E03FFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{001573F8-5364-4087-B716-28993E03FFF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E28342C8-A4CB-4282-9F3B-FE9FE8A0D94C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E28342C8-A4CB-4282-9F3B-FE9FE8A0D94C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E28342C8-A4CB-4282-9F3B-FE9FE8A0D94C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E28342C8-A4CB-4282-9F3B-FE9FE8A0D94C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E6C08D1F-5DAC-470E-809D-42DBFAA56DD4} = {8FA3CF3F-DF33-4DC4-A261-4642AB786838}
-		{857B2747-4D8E-4A0C-9C38-521F690ED28E} = {78938ED3-0E8A-451A-A508-0E724E471B91}
-		{95680D66-EE1B-4389-A84D-0C49AF570732} = {78938ED3-0E8A-451A-A508-0E724E471B91}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {48FA418B-CCC2-4EBD-9CDA-F31C72AC9B05}
+		SolutionGuid = {A835CEDB-E9E2-49EE-8499-BD7FDD984E53}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
index 26f057e5cd9311..88895ed747a7f8 100644
--- a/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
+++ b/src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8} = {149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A18337A4-46D6-470C-A995-CA70E5311F19}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "src\Microsoft.CSharp.csproj", "{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1427906B-FF3D-422A-8278-F2B7E89DE12A} = {1427906B-FF3D-422A-8278-F2B7E89DE12A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "ref\Microsoft.CSharp.csproj", "{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "ref\Microsoft.CSharp.csproj", "{1427906B-FF3D-422A-8278-F2B7E89DE12A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "src\Microsoft.CSharp.csproj", "{78073F44-8382-473D-8B24-90D54B57129E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{792ECA46-1495-4F60-B25F-CDCFEADD4921}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4853B3B6-3F48-43CA-B750-5B870EE4A96F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{FCFD5BF1-38A7-49C7-B11A-3F09299AB404}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{61C71A34-6887-4DD2-B80A-F71C73C92880}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{187751D8-DFDF-4BFB-AB05-FECC69A2DDE3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B0AC27E4-0FEF-4FBA-B0F9-5DBCCA763A66}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D1FEE79B-397C-464C-BF9F-1F8FC6471101}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A18337A4-46D6-470C-A995-CA70E5311F19} = {187751D8-DFDF-4BFB-AB05-FECC69A2DDE3}
+		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA} = {187751D8-DFDF-4BFB-AB05-FECC69A2DDE3}
+		{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A} = {B0AC27E4-0FEF-4FBA-B0F9-5DBCCA763A66}
+		{792ECA46-1495-4F60-B25F-CDCFEADD4921} = {B0AC27E4-0FEF-4FBA-B0F9-5DBCCA763A66}
+		{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB} = {B0AC27E4-0FEF-4FBA-B0F9-5DBCCA763A66}
+		{FCFD5BF1-38A7-49C7-B11A-3F09299AB404} = {B0AC27E4-0FEF-4FBA-B0F9-5DBCCA763A66}
+		{61C71A34-6887-4DD2-B80A-F71C73C92880} = {B0AC27E4-0FEF-4FBA-B0F9-5DBCCA763A66}
+		{78073F44-8382-473D-8B24-90D54B57129E} = {D1FEE79B-397C-464C-BF9F-1F8FC6471101}
+		{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49} = {D1FEE79B-397C-464C-BF9F-1F8FC6471101}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82B54697-0251-47A1-8546-FC507D0F3B08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82B54697-0251-47A1-8546-FC507D0F3B08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1427906B-FF3D-422A-8278-F2B7E89DE12A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4853B3B6-3F48-43CA-B750-5B870EE4A96F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A18337A4-46D6-470C-A995-CA70E5311F19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A18337A4-46D6-470C-A995-CA70E5311F19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A18337A4-46D6-470C-A995-CA70E5311F19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A18337A4-46D6-470C-A995-CA70E5311F19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF947490-D7AE-46E1-B4E0-D8A6D1EA8E5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78073F44-8382-473D-8B24-90D54B57129E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78073F44-8382-473D-8B24-90D54B57129E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78073F44-8382-473D-8B24-90D54B57129E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78073F44-8382-473D-8B24-90D54B57129E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AEDFF97-79E2-441E-8B3F-5C8EC9C1E8FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{792ECA46-1495-4F60-B25F-CDCFEADD4921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{792ECA46-1495-4F60-B25F-CDCFEADD4921}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{792ECA46-1495-4F60-B25F-CDCFEADD4921}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{792ECA46-1495-4F60-B25F-CDCFEADD4921}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DA2C0A8-13C0-4F65-85AC-29AB97A039EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD0869E8-3AE5-43AA-AD9C-1E26859D9D49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCFD5BF1-38A7-49C7-B11A-3F09299AB404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCFD5BF1-38A7-49C7-B11A-3F09299AB404}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCFD5BF1-38A7-49C7-B11A-3F09299AB404}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCFD5BF1-38A7-49C7-B11A-3F09299AB404}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61C71A34-6887-4DD2-B80A-F71C73C92880}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61C71A34-6887-4DD2-B80A-F71C73C92880}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61C71A34-6887-4DD2-B80A-F71C73C92880}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61C71A34-6887-4DD2-B80A-F71C73C92880}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{82B54697-0251-47A1-8546-FC507D0F3B08} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{149D7DFE-2FAC-4A38-89AD-E24CE63AACB8} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{1427906B-FF3D-422A-8278-F2B7E89DE12A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{4853B3B6-3F48-43CA-B750-5B870EE4A96F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {89BC0057-5CFB-4B4B-B255-A5EDB54CFEAE}
+		SolutionGuid = {A1ECF510-F5DB-4E7F-853E-DD3C0CE04C12}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
index 09a459746e5922..f89e868051db72 100644
--- a/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
+++ b/src/libraries/Microsoft.Diagnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
@@ -1,48 +1,79 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests", "tests\Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj", "{0657A043-0AEE-445E-9BE4-0B3A9D80318F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D71CB9DA-6691-4A1A-80CA-45736E4B9272}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist", "src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj", "{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource", "src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj", "{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests", "tests\Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj", "{B25DF443-E116-4D44-B2AB-6D4333F59F32}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{8BBCAD19-4705-4C75-82CC-0FAE523FB211}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B83AFCDC-F6A3-4216-8098-8F163179D131}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{94318389-1E44-44D5-8584-ACE54E8AFAB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CC0D5221-6570-4C5C-9D12-41206483A43F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B2BCBE3E-44F8-4B26-87C3-88A027A842AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19E613A0-82F5-41B6-B36F-CB711E7AD8E6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{35EA36E3-099D-4EFC-80E6-0F7B4753111D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4959A1AD-6529-40BE-AADF-D49EF7923256}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D71CB9DA-6691-4A1A-80CA-45736E4B9272} = {19E613A0-82F5-41B6-B36F-CB711E7AD8E6}
+		{B25DF443-E116-4D44-B2AB-6D4333F59F32} = {19E613A0-82F5-41B6-B36F-CB711E7AD8E6}
+		{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F} = {35EA36E3-099D-4EFC-80E6-0F7B4753111D}
+		{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E} = {35EA36E3-099D-4EFC-80E6-0F7B4753111D}
+		{8BBCAD19-4705-4C75-82CC-0FAE523FB211} = {4959A1AD-6529-40BE-AADF-D49EF7923256}
+		{94318389-1E44-44D5-8584-ACE54E8AFAB7} = {4959A1AD-6529-40BE-AADF-D49EF7923256}
+		{CC0D5221-6570-4C5C-9D12-41206483A43F} = {4959A1AD-6529-40BE-AADF-D49EF7923256}
+		{B2BCBE3E-44F8-4B26-87C3-88A027A842AE} = {4959A1AD-6529-40BE-AADF-D49EF7923256}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0657A043-0AEE-445E-9BE4-0B3A9D80318F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B83AFCDC-F6A3-4216-8098-8F163179D131}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D71CB9DA-6691-4A1A-80CA-45736E4B9272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D71CB9DA-6691-4A1A-80CA-45736E4B9272}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D71CB9DA-6691-4A1A-80CA-45736E4B9272}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D71CB9DA-6691-4A1A-80CA-45736E4B9272}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7BDDDA5-180A-4CA8-864B-F9FC4E046D4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B25DF443-E116-4D44-B2AB-6D4333F59F32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BBCAD19-4705-4C75-82CC-0FAE523FB211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BBCAD19-4705-4C75-82CC-0FAE523FB211}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BBCAD19-4705-4C75-82CC-0FAE523FB211}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BBCAD19-4705-4C75-82CC-0FAE523FB211}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94318389-1E44-44D5-8584-ACE54E8AFAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94318389-1E44-44D5-8584-ACE54E8AFAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94318389-1E44-44D5-8584-ACE54E8AFAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94318389-1E44-44D5-8584-ACE54E8AFAB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEF8A648-9F38-4473-AE1D-EE4AB0B7531E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC0D5221-6570-4C5C-9D12-41206483A43F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC0D5221-6570-4C5C-9D12-41206483A43F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC0D5221-6570-4C5C-9D12-41206483A43F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC0D5221-6570-4C5C-9D12-41206483A43F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2BCBE3E-44F8-4B26-87C3-88A027A842AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2BCBE3E-44F8-4B26-87C3-88A027A842AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2BCBE3E-44F8-4B26-87C3-88A027A842AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2BCBE3E-44F8-4B26-87C3-88A027A842AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0657A043-0AEE-445E-9BE4-0B3A9D80318F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B83AFCDC-F6A3-4216-8098-8F163179D131} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {53827F58-3CA5-4CEF-9176-70DD35463C1E}
+		SolutionGuid = {8CAF340C-E3EF-4DF0-998D-A17DE2C72207}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln
index 7c8767aa2a7746..2a78e9192292ce 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Caching.Abstractions/Microsoft.Extensions.Caching.Abstractions.sln
@@ -1,39 +1,63 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F74D9835-34F2-4D54-8E2C-CD07313A6896}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "ref\Microsoft.Extensions.Caching.Abstractions.csproj", "{E206E7BE-3269-4E6E-BF22-0E20B687E90C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6BADF50B-9459-42E2-A4BD-800952EE390C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "src\Microsoft.Extensions.Caching.Abstractions.csproj", "{5904EB23-3221-4992-A1F9-70F8B5478DF2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "ref\Microsoft.Extensions.Caching.Abstractions.csproj", "{64ADA6B3-7B32-46E5-B4F4-F2935C59709A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "src\Microsoft.Extensions.Caching.Abstractions.csproj", "{8C6A8725-9C47-4AB1-9C79-E1A55DAF03EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{9556B0C4-098C-45E3-A7EB-1A219B7F941C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{470D5AB0-A04A-46EE-8444-9247D000958E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6B5CCFF6-9D90-4AE4-B2A4-30A98F7255A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B393CE17-F554-4F59-8487-BF67A646AF32}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E206E7BE-3269-4E6E-BF22-0E20B687E90C} = {6B5CCFF6-9D90-4AE4-B2A4-30A98F7255A2}
+		{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90} = {6B5CCFF6-9D90-4AE4-B2A4-30A98F7255A2}
+		{470D5AB0-A04A-46EE-8444-9247D000958E} = {6B5CCFF6-9D90-4AE4-B2A4-30A98F7255A2}
+		{5904EB23-3221-4992-A1F9-70F8B5478DF2} = {B393CE17-F554-4F59-8487-BF67A646AF32}
+		{9556B0C4-098C-45E3-A7EB-1A219B7F941C} = {B393CE17-F554-4F59-8487-BF67A646AF32}
+		{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0} = {B393CE17-F554-4F59-8487-BF67A646AF32}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{64ADA6B3-7B32-46E5-B4F4-F2935C59709A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64ADA6B3-7B32-46E5-B4F4-F2935C59709A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64ADA6B3-7B32-46E5-B4F4-F2935C59709A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64ADA6B3-7B32-46E5-B4F4-F2935C59709A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C6A8725-9C47-4AB1-9C79-E1A55DAF03EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C6A8725-9C47-4AB1-9C79-E1A55DAF03EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C6A8725-9C47-4AB1-9C79-E1A55DAF03EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C6A8725-9C47-4AB1-9C79-E1A55DAF03EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E206E7BE-3269-4E6E-BF22-0E20B687E90C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E206E7BE-3269-4E6E-BF22-0E20B687E90C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E206E7BE-3269-4E6E-BF22-0E20B687E90C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E206E7BE-3269-4E6E-BF22-0E20B687E90C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5904EB23-3221-4992-A1F9-70F8B5478DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5904EB23-3221-4992-A1F9-70F8B5478DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5904EB23-3221-4992-A1F9-70F8B5478DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5904EB23-3221-4992-A1F9-70F8B5478DF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CE7A561-5A2F-4AF3-8CC2-8148BC5CCE90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9556B0C4-098C-45E3-A7EB-1A219B7F941C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{470D5AB0-A04A-46EE-8444-9247D000958E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{470D5AB0-A04A-46EE-8444-9247D000958E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{470D5AB0-A04A-46EE-8444-9247D000958E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{470D5AB0-A04A-46EE-8444-9247D000958E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C891B23-07C9-4261-9DB2-C8EAE91A0EA0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{64ADA6B3-7B32-46E5-B4F4-F2935C59709A} = {F74D9835-34F2-4D54-8E2C-CD07313A6896}
-		{8C6A8725-9C47-4AB1-9C79-E1A55DAF03EE} = {6BADF50B-9459-42E2-A4BD-800952EE390C}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {69A7E42A-FE3F-4115-92A5-CAE19C240525}
+		SolutionGuid = {68BF65EA-B5BA-44C6-8463-45BA1F186520}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
index 91e6ed986197ae..9239f6776e59e1 100644
--- a/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
+++ b/src/libraries/Microsoft.Extensions.Caching.Memory/Microsoft.Extensions.Caching.Memory.sln
@@ -1,55 +1,184 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{20ACD179-AFDD-456A-9D27-5F4B036BA5AB}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02F50816-753B-4542-BDB9-80B6AD32D31F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{950759B3-269E-4768-9107-4D1C3B0F9DC8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A56177C8-32A9-4C5A-9AE8-312F209B3F32}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{21CD6C35-65E2-414A-B9A1-22A0DD57977A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory", "ref\Microsoft.Extensions.Caching.Memory.csproj", "{CB26F7AD-3279-4BBB-B33A-485CBF2B0787}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "..\Microsoft.Extensions.Caching.Abstractions\ref\Microsoft.Extensions.Caching.Abstractions.csproj", "{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory", "src\Microsoft.Extensions.Caching.Memory.csproj", "{802F8E4B-C890-4312-B8A1-BF0201C7F949}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Abstractions", "..\Microsoft.Extensions.Caching.Abstractions\src\Microsoft.Extensions.Caching.Abstractions.csproj", "{AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory.Tests", "tests\Microsoft.Extensions.Caching.Memory.Tests.csproj", "{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory", "ref\Microsoft.Extensions.Caching.Memory.csproj", "{BE9DB8BC-43B1-47A5-B232-FCAAE9D03251}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9BE95529-D00D-4D03-82F1-103891E17F28}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory", "src\Microsoft.Extensions.Caching.Memory.csproj", "{CD3D6F5B-0500-4035-A60A-592A2E231011}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Memory.Tests", "tests\Microsoft.Extensions.Caching.Memory.Tests.csproj", "{19E7C366-8F61-4E7A-8C31-02FDDB26665A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{9F0655E7-42FE-4AE0-A351-5624C73A35AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{4A6F459B-FBFE-44D9-9F52-944302D6D027}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{78971B06-2519-45B7-B761-C8A30C168EBE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{C76753D0-F564-45E9-AA60-A846EFE0A414}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{5A9310B4-82AB-46F8-83C1-72D21A6A761F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{FCF170AC-100A-4EEE-849E-497A299EDE3F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{667107A7-2CC7-4506-A6A6-223BB86290E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{19883A68-1293-46AE-98FD-8C559D414EFD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B6D30918-C1B7-4225-A809-E13A5817DE22}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A3DAEDEB-BEB5-4E93-9F34-0DCA5813F971}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{81715711-5517-422C-B746-6F98FE1245AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{87F9233C-1DB8-4216-B31A-EBCBAC4C9B8D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CB38DFD9-956F-4999-A866-C348FF706C28}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{10E82325-75BE-4338-9288-BA4319D1502F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A} = {87F9233C-1DB8-4216-B31A-EBCBAC4C9B8D}
+		{19E7C366-8F61-4E7A-8C31-02FDDB26665A} = {87F9233C-1DB8-4216-B31A-EBCBAC4C9B8D}
+		{950759B3-269E-4768-9107-4D1C3B0F9DC8} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{BE9DB8BC-43B1-47A5-B232-FCAAE9D03251} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{9F0655E7-42FE-4AE0-A351-5624C73A35AC} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{4A6F459B-FBFE-44D9-9F52-944302D6D027} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{FCF170AC-100A-4EEE-849E-497A299EDE3F} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{667107A7-2CC7-4506-A6A6-223BB86290E7} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{19883A68-1293-46AE-98FD-8C559D414EFD} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{A3DAEDEB-BEB5-4E93-9F34-0DCA5813F971} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{81715711-5517-422C-B746-6F98FE1245AE} = {CB38DFD9-956F-4999-A866-C348FF706C28}
+		{21CD6C35-65E2-414A-B9A1-22A0DD57977A} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{CD3D6F5B-0500-4035-A60A-592A2E231011} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{78971B06-2519-45B7-B761-C8A30C168EBE} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{C76753D0-F564-45E9-AA60-A846EFE0A414} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{5A9310B4-82AB-46F8-83C1-72D21A6A761F} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B} = {10E82325-75BE-4338-9288-BA4319D1502F}
+		{B6D30918-C1B7-4225-A809-E13A5817DE22} = {10E82325-75BE-4338-9288-BA4319D1502F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CB26F7AD-3279-4BBB-B33A-485CBF2B0787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB26F7AD-3279-4BBB-B33A-485CBF2B0787}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB26F7AD-3279-4BBB-B33A-485CBF2B0787}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB26F7AD-3279-4BBB-B33A-485CBF2B0787}.Release|Any CPU.Build.0 = Release|Any CPU
-		{802F8E4B-C890-4312-B8A1-BF0201C7F949}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{802F8E4B-C890-4312-B8A1-BF0201C7F949}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{802F8E4B-C890-4312-B8A1-BF0201C7F949}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{802F8E4B-C890-4312-B8A1-BF0201C7F949}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BE95529-D00D-4D03-82F1-103891E17F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BE95529-D00D-4D03-82F1-103891E17F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BE95529-D00D-4D03-82F1-103891E17F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BE95529-D00D-4D03-82F1-103891E17F28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F5BF50A-689F-4A94-8EA5-26C8ADF1DA9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{950759B3-269E-4768-9107-4D1C3B0F9DC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{950759B3-269E-4768-9107-4D1C3B0F9DC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{950759B3-269E-4768-9107-4D1C3B0F9DC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{950759B3-269E-4768-9107-4D1C3B0F9DC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21CD6C35-65E2-414A-B9A1-22A0DD57977A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7521082D-62A8-4B62-A6D0-E6A94B2BC8EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA9524B1-37B3-4A6D-B2D5-A6A2C910E1A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE9DB8BC-43B1-47A5-B232-FCAAE9D03251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE9DB8BC-43B1-47A5-B232-FCAAE9D03251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE9DB8BC-43B1-47A5-B232-FCAAE9D03251}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE9DB8BC-43B1-47A5-B232-FCAAE9D03251}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD3D6F5B-0500-4035-A60A-592A2E231011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD3D6F5B-0500-4035-A60A-592A2E231011}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD3D6F5B-0500-4035-A60A-592A2E231011}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD3D6F5B-0500-4035-A60A-592A2E231011}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19E7C366-8F61-4E7A-8C31-02FDDB26665A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19E7C366-8F61-4E7A-8C31-02FDDB26665A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19E7C366-8F61-4E7A-8C31-02FDDB26665A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19E7C366-8F61-4E7A-8C31-02FDDB26665A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F0655E7-42FE-4AE0-A351-5624C73A35AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F0655E7-42FE-4AE0-A351-5624C73A35AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F0655E7-42FE-4AE0-A351-5624C73A35AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F0655E7-42FE-4AE0-A351-5624C73A35AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A8C0B86-1CA3-4FFE-86FC-9EF0A733BEC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A6F459B-FBFE-44D9-9F52-944302D6D027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A6F459B-FBFE-44D9-9F52-944302D6D027}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A6F459B-FBFE-44D9-9F52-944302D6D027}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A6F459B-FBFE-44D9-9F52-944302D6D027}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78971B06-2519-45B7-B761-C8A30C168EBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78971B06-2519-45B7-B761-C8A30C168EBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78971B06-2519-45B7-B761-C8A30C168EBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDC4E2D9-627A-4DE2-BF31-A95351C1CB7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C76753D0-F564-45E9-AA60-A846EFE0A414}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C76753D0-F564-45E9-AA60-A846EFE0A414}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C76753D0-F564-45E9-AA60-A846EFE0A414}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C76753D0-F564-45E9-AA60-A846EFE0A414}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1958AE1D-55EA-4550-BE58-0AFDBB2EDB8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A9310B4-82AB-46F8-83C1-72D21A6A761F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A9310B4-82AB-46F8-83C1-72D21A6A761F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A9310B4-82AB-46F8-83C1-72D21A6A761F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A9310B4-82AB-46F8-83C1-72D21A6A761F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCF170AC-100A-4EEE-849E-497A299EDE3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCF170AC-100A-4EEE-849E-497A299EDE3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCF170AC-100A-4EEE-849E-497A299EDE3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCF170AC-100A-4EEE-849E-497A299EDE3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA43AA92-35BA-4B84-BAA2-C3BB56C8BB3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{667107A7-2CC7-4506-A6A6-223BB86290E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{667107A7-2CC7-4506-A6A6-223BB86290E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{667107A7-2CC7-4506-A6A6-223BB86290E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{667107A7-2CC7-4506-A6A6-223BB86290E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19883A68-1293-46AE-98FD-8C559D414EFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19883A68-1293-46AE-98FD-8C559D414EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19883A68-1293-46AE-98FD-8C559D414EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19883A68-1293-46AE-98FD-8C559D414EFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6D30918-C1B7-4225-A809-E13A5817DE22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6D30918-C1B7-4225-A809-E13A5817DE22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6D30918-C1B7-4225-A809-E13A5817DE22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6D30918-C1B7-4225-A809-E13A5817DE22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3DAEDEB-BEB5-4E93-9F34-0DCA5813F971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3DAEDEB-BEB5-4E93-9F34-0DCA5813F971}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3DAEDEB-BEB5-4E93-9F34-0DCA5813F971}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3DAEDEB-BEB5-4E93-9F34-0DCA5813F971}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81715711-5517-422C-B746-6F98FE1245AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81715711-5517-422C-B746-6F98FE1245AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81715711-5517-422C-B746-6F98FE1245AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81715711-5517-422C-B746-6F98FE1245AE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CB26F7AD-3279-4BBB-B33A-485CBF2B0787} = {20ACD179-AFDD-456A-9D27-5F4B036BA5AB}
-		{802F8E4B-C890-4312-B8A1-BF0201C7F949} = {02F50816-753B-4542-BDB9-80B6AD32D31F}
-		{DE244209-5EC7-47DD-8EC9-7B634DFDA1B7} = {A56177C8-32A9-4C5A-9AE8-312F209B3F32}
-		{9BE95529-D00D-4D03-82F1-103891E17F28} = {A56177C8-32A9-4C5A-9AE8-312F209B3F32}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {67FE26A1-86FB-4A0F-83E4-3CD98E58DF2E}
+		SolutionGuid = {38ED157C-646E-43DD-B8B0-562DD5715E27}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln
index 3a0cd7ec9fcbaa..9671f7b7c885a8 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.sln
@@ -1,39 +1,63 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{483CC058-D1EA-4243-9342-101A5D68CE52}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{9F7A72E7-041E-47C8-ABD7-C5EF028AFECF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F6D3FD68-6B5D-44C2-A74C-3B98AEB5C2C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{CAA4A23C-2C58-4C93-87BA-CCC87260F20A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{B0857D51-B043-4C7D-8112-1B639C1B1DA6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{711119F1-7759-49B9-8B66-EF72F4163729}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{600D61CB-E996-44CC-A64C-9EC10601EF64}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{EEE9E1A2-8512-4154-8B5D-532244B896CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{63E86A57-8F84-435E-8D03-5464070A276F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D097AD3E-419C-4209-A7D0-52A53A16CED6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E15C1590-2232-4D14-9C2B-A6BC185708CA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F1346AA-E583-4F60-97AE-AA27886116EE}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{9F7A72E7-041E-47C8-ABD7-C5EF028AFECF} = {E15C1590-2232-4D14-9C2B-A6BC185708CA}
+		{711119F1-7759-49B9-8B66-EF72F4163729} = {E15C1590-2232-4D14-9C2B-A6BC185708CA}
+		{63E86A57-8F84-435E-8D03-5464070A276F} = {E15C1590-2232-4D14-9C2B-A6BC185708CA}
+		{CAA4A23C-2C58-4C93-87BA-CCC87260F20A} = {0F1346AA-E583-4F60-97AE-AA27886116EE}
+		{EEE9E1A2-8512-4154-8B5D-532244B896CD} = {0F1346AA-E583-4F60-97AE-AA27886116EE}
+		{D097AD3E-419C-4209-A7D0-52A53A16CED6} = {0F1346AA-E583-4F60-97AE-AA27886116EE}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0857D51-B043-4C7D-8112-1B639C1B1DA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0857D51-B043-4C7D-8112-1B639C1B1DA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0857D51-B043-4C7D-8112-1B639C1B1DA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0857D51-B043-4C7D-8112-1B639C1B1DA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{600D61CB-E996-44CC-A64C-9EC10601EF64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{600D61CB-E996-44CC-A64C-9EC10601EF64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{600D61CB-E996-44CC-A64C-9EC10601EF64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{600D61CB-E996-44CC-A64C-9EC10601EF64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F7A72E7-041E-47C8-ABD7-C5EF028AFECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F7A72E7-041E-47C8-ABD7-C5EF028AFECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F7A72E7-041E-47C8-ABD7-C5EF028AFECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F7A72E7-041E-47C8-ABD7-C5EF028AFECF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAA4A23C-2C58-4C93-87BA-CCC87260F20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAA4A23C-2C58-4C93-87BA-CCC87260F20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAA4A23C-2C58-4C93-87BA-CCC87260F20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAA4A23C-2C58-4C93-87BA-CCC87260F20A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{711119F1-7759-49B9-8B66-EF72F4163729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{711119F1-7759-49B9-8B66-EF72F4163729}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{711119F1-7759-49B9-8B66-EF72F4163729}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{711119F1-7759-49B9-8B66-EF72F4163729}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEE9E1A2-8512-4154-8B5D-532244B896CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63E86A57-8F84-435E-8D03-5464070A276F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63E86A57-8F84-435E-8D03-5464070A276F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63E86A57-8F84-435E-8D03-5464070A276F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63E86A57-8F84-435E-8D03-5464070A276F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D097AD3E-419C-4209-A7D0-52A53A16CED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D097AD3E-419C-4209-A7D0-52A53A16CED6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D097AD3E-419C-4209-A7D0-52A53A16CED6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D097AD3E-419C-4209-A7D0-52A53A16CED6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B0857D51-B043-4C7D-8112-1B639C1B1DA6} = {483CC058-D1EA-4243-9342-101A5D68CE52}
-		{600D61CB-E996-44CC-A64C-9EC10601EF64} = {F6D3FD68-6B5D-44C2-A74C-3B98AEB5C2C6}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {05338E37-3D76-4069-803C-402FF29AD024}
+		SolutionGuid = {35095991-4720-4061-A85F-72B39261D8C0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln b/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
index a25d7b83e49795..408c2b9efc7b41 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.sln
@@ -1,55 +1,142 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{19975C7D-D7E2-4551-84BF-8522B6FC30C3}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5FB89358-3575-45AA-ACFE-EF3598B9AB7E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CC762868-69E6-47E7-912C-FFF27A07C5F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{CB09105A-F475-4A91-8836-434FA175F4F9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9CAA4208-C432-49B4-8661-4DDE821EF154}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{958E5946-FD21-4167-B471-8CEC2CB8D75D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "ref\Microsoft.Extensions.Configuration.Binder.csproj", "{C6976CEC-09C6-430E-8576-B0AFE6BAD263}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "ref\Microsoft.Extensions.Configuration.Binder.csproj", "{F05212B2-FD66-4E8E-AEA0-FAC06A0D6808}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "src\Microsoft.Extensions.Configuration.Binder.csproj", "{220E2B81-5D96-4999-A3CA-D9F681B3C8F4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "src\Microsoft.Extensions.Configuration.Binder.csproj", "{8C7443D8-864A-4DAE-8835-108580C289F5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder.Tests", "tests\Microsoft.Extensions.Configuration.Binder.Tests.csproj", "{6AAC9F65-3F45-41B0-991F-530F652E53AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder.Tests", "tests\Microsoft.Extensions.Configuration.Binder.Tests.csproj", "{FD4C7C59-55A7-42C8-9B75-43728FAFDD84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{39D99379-E744-4295-9CA8-B5C6DE286EA0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{5177A566-05AF-4DF0-93CC-D2876F7E6EBB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{42DAD2C1-0FD4-442E-B218-9CDACE6EEB01}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{091844B8-A79E-4DF4-9A73-B2F01968E982}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{9B21B87F-084B-411B-A513-C22B5B961BF3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{A590DC78-8238-47C6-B35C-921642717326}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8D6A2F57-CCA3-4845-9569-29560465B6AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9E2A4D82-0CBF-4908-8801-11B1C209EB23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{77449CF5-849D-4525-AECA-5A4D4E730BC9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{578CAB10-C89F-494C-A5F4-514CDD29945D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{09D0E545-ECD4-461C-A34E-3DD8A5E8D0F3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{05C5425E-6DB2-4F5E-912F-70B236E80509}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{46033392-C607-4795-9838-6CF810C5E382}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5FB89358-3575-45AA-ACFE-EF3598B9AB7E} = {09D0E545-ECD4-461C-A34E-3DD8A5E8D0F3}
+		{FD4C7C59-55A7-42C8-9B75-43728FAFDD84} = {09D0E545-ECD4-461C-A34E-3DD8A5E8D0F3}
+		{CB09105A-F475-4A91-8836-434FA175F4F9} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{F05212B2-FD66-4E8E-AEA0-FAC06A0D6808} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{39D99379-E744-4295-9CA8-B5C6DE286EA0} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{42DAD2C1-0FD4-442E-B218-9CDACE6EEB01} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{A590DC78-8238-47C6-B35C-921642717326} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{8D6A2F57-CCA3-4845-9569-29560465B6AC} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{77449CF5-849D-4525-AECA-5A4D4E730BC9} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{578CAB10-C89F-494C-A5F4-514CDD29945D} = {05C5425E-6DB2-4F5E-912F-70B236E80509}
+		{958E5946-FD21-4167-B471-8CEC2CB8D75D} = {46033392-C607-4795-9838-6CF810C5E382}
+		{8C7443D8-864A-4DAE-8835-108580C289F5} = {46033392-C607-4795-9838-6CF810C5E382}
+		{5177A566-05AF-4DF0-93CC-D2876F7E6EBB} = {46033392-C607-4795-9838-6CF810C5E382}
+		{091844B8-A79E-4DF4-9A73-B2F01968E982} = {46033392-C607-4795-9838-6CF810C5E382}
+		{9B21B87F-084B-411B-A513-C22B5B961BF3} = {46033392-C607-4795-9838-6CF810C5E382}
+		{9E2A4D82-0CBF-4908-8801-11B1C209EB23} = {46033392-C607-4795-9838-6CF810C5E382}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C6976CEC-09C6-430E-8576-B0AFE6BAD263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6976CEC-09C6-430E-8576-B0AFE6BAD263}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6976CEC-09C6-430E-8576-B0AFE6BAD263}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C6976CEC-09C6-430E-8576-B0AFE6BAD263}.Release|Any CPU.Build.0 = Release|Any CPU
-		{220E2B81-5D96-4999-A3CA-D9F681B3C8F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{220E2B81-5D96-4999-A3CA-D9F681B3C8F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{220E2B81-5D96-4999-A3CA-D9F681B3C8F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{220E2B81-5D96-4999-A3CA-D9F681B3C8F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AAC9F65-3F45-41B0-991F-530F652E53AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FB89358-3575-45AA-ACFE-EF3598B9AB7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB09105A-F475-4A91-8836-434FA175F4F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB09105A-F475-4A91-8836-434FA175F4F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB09105A-F475-4A91-8836-434FA175F4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB09105A-F475-4A91-8836-434FA175F4F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{958E5946-FD21-4167-B471-8CEC2CB8D75D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{958E5946-FD21-4167-B471-8CEC2CB8D75D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{958E5946-FD21-4167-B471-8CEC2CB8D75D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{958E5946-FD21-4167-B471-8CEC2CB8D75D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F05212B2-FD66-4E8E-AEA0-FAC06A0D6808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F05212B2-FD66-4E8E-AEA0-FAC06A0D6808}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F05212B2-FD66-4E8E-AEA0-FAC06A0D6808}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F05212B2-FD66-4E8E-AEA0-FAC06A0D6808}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C7443D8-864A-4DAE-8835-108580C289F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C7443D8-864A-4DAE-8835-108580C289F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C7443D8-864A-4DAE-8835-108580C289F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C7443D8-864A-4DAE-8835-108580C289F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD4C7C59-55A7-42C8-9B75-43728FAFDD84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD4C7C59-55A7-42C8-9B75-43728FAFDD84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD4C7C59-55A7-42C8-9B75-43728FAFDD84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD4C7C59-55A7-42C8-9B75-43728FAFDD84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39D99379-E744-4295-9CA8-B5C6DE286EA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39D99379-E744-4295-9CA8-B5C6DE286EA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39D99379-E744-4295-9CA8-B5C6DE286EA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39D99379-E744-4295-9CA8-B5C6DE286EA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5177A566-05AF-4DF0-93CC-D2876F7E6EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5177A566-05AF-4DF0-93CC-D2876F7E6EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5177A566-05AF-4DF0-93CC-D2876F7E6EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5177A566-05AF-4DF0-93CC-D2876F7E6EBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42DAD2C1-0FD4-442E-B218-9CDACE6EEB01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42DAD2C1-0FD4-442E-B218-9CDACE6EEB01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42DAD2C1-0FD4-442E-B218-9CDACE6EEB01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42DAD2C1-0FD4-442E-B218-9CDACE6EEB01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{091844B8-A79E-4DF4-9A73-B2F01968E982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{091844B8-A79E-4DF4-9A73-B2F01968E982}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{091844B8-A79E-4DF4-9A73-B2F01968E982}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{091844B8-A79E-4DF4-9A73-B2F01968E982}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C288A6A-17C9-40A9-A1AA-E0FC3927DFE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B21B87F-084B-411B-A513-C22B5B961BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B21B87F-084B-411B-A513-C22B5B961BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B21B87F-084B-411B-A513-C22B5B961BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B21B87F-084B-411B-A513-C22B5B961BF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A590DC78-8238-47C6-B35C-921642717326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A590DC78-8238-47C6-B35C-921642717326}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A590DC78-8238-47C6-B35C-921642717326}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A590DC78-8238-47C6-B35C-921642717326}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D6A2F57-CCA3-4845-9569-29560465B6AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D6A2F57-CCA3-4845-9569-29560465B6AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D6A2F57-CCA3-4845-9569-29560465B6AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D6A2F57-CCA3-4845-9569-29560465B6AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E2A4D82-0CBF-4908-8801-11B1C209EB23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77449CF5-849D-4525-AECA-5A4D4E730BC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77449CF5-849D-4525-AECA-5A4D4E730BC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77449CF5-849D-4525-AECA-5A4D4E730BC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77449CF5-849D-4525-AECA-5A4D4E730BC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{578CAB10-C89F-494C-A5F4-514CDD29945D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{578CAB10-C89F-494C-A5F4-514CDD29945D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{578CAB10-C89F-494C-A5F4-514CDD29945D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{578CAB10-C89F-494C-A5F4-514CDD29945D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C6976CEC-09C6-430E-8576-B0AFE6BAD263} = {19975C7D-D7E2-4551-84BF-8522B6FC30C3}
-		{220E2B81-5D96-4999-A3CA-D9F681B3C8F4} = {CC762868-69E6-47E7-912C-FFF27A07C5F3}
-		{6AAC9F65-3F45-41B0-991F-530F652E53AD} = {9CAA4208-C432-49B4-8661-4DDE821EF154}
-		{69C2ABE2-DBFD-4E7E-A9F2-87D74BB83D83} = {9CAA4208-C432-49B4-8661-4DDE821EF154}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4B5E9104-9917-47A2-B17C-D420E6A13467}
+		SolutionGuid = {A97DC4BF-32F0-46E8-B91C-84D1E7F2A27E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
index 3bbfcc0dfcf02f..c8312e76fedab9 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.sln
@@ -1,55 +1,156 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BDE47CA9-FA28-4B80-97AD-C1ADA07E109F}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C93CA38A-6881-4A73-B1C8-033474857135}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1E7E6E50-5748-4E9A-A36D-5DFF485957A3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{119684C3-F2BF-440E-A832-1ACA0D007F58}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9361978B-A180-4DC2-AD57-82D7B94964CD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{3752E6AE-0EBD-4A82-9FCF-375A39F99F0F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "ref\Microsoft.Extensions.Configuration.CommandLine.csproj", "{657CD674-B225-4D8B-BFF0-41F4B0203FB5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{42A9FDD2-A38C-4F44-A91A-9E2C5D6C97FF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "src\Microsoft.Extensions.Configuration.CommandLine.csproj", "{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{4BB9602E-5233-4399-A4B5-D4E8AD38741B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine.Tests", "tests\Microsoft.Extensions.Configuration.CommandLine.Tests.csproj", "{2A8DAEB6-95DE-47F1-88E0-42675279FD87}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "ref\Microsoft.Extensions.Configuration.CommandLine.csproj", "{52D93DFA-9CC9-4C5B-9A37-46391B04E61F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "src\Microsoft.Extensions.Configuration.CommandLine.csproj", "{76656E96-A647-4098-934D-8F752A3F2FD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine.Tests", "tests\Microsoft.Extensions.Configuration.CommandLine.Tests.csproj", "{3BFDB74F-44FE-4521-86A7-AB52FB261AA6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{15B92D3C-B29E-488B-90FC-324167935409}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{40653EBF-E569-4F85-843D-FFABBB70CFC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{27EB8901-D9CB-4814-8565-8D2CE564F2C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{384EE35D-2668-42B6-8615-6BD6C4AA5273}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{140853AE-EDA5-4914-951A-8323918A9A11}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3746E645-BFCF-4EF1-88E1-CF0D27805608}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2DC76A30-E31B-42C2-AA6B-F022FFA49BAD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{4907F731-1D47-46A8-9FBD-7AD0457BE47F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FAF83B4D-6CF1-4824-998D-D9BFCC226DB3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6EB9B342-A077-4E6B-B021-FB01A9CC02C4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{734D4174-F73E-46A0-B379-BB9FDD25C0FB}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C93CA38A-6881-4A73-B1C8-033474857135} = {FAF83B4D-6CF1-4824-998D-D9BFCC226DB3}
+		{3BFDB74F-44FE-4521-86A7-AB52FB261AA6} = {FAF83B4D-6CF1-4824-998D-D9BFCC226DB3}
+		{119684C3-F2BF-440E-A832-1ACA0D007F58} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{42A9FDD2-A38C-4F44-A91A-9E2C5D6C97FF} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{52D93DFA-9CC9-4C5B-9A37-46391B04E61F} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{15B92D3C-B29E-488B-90FC-324167935409} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{40653EBF-E569-4F85-843D-FFABBB70CFC8} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{384EE35D-2668-42B6-8615-6BD6C4AA5273} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{140853AE-EDA5-4914-951A-8323918A9A11} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{3746E645-BFCF-4EF1-88E1-CF0D27805608} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{2DC76A30-E31B-42C2-AA6B-F022FFA49BAD} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{4907F731-1D47-46A8-9FBD-7AD0457BE47F} = {6EB9B342-A077-4E6B-B021-FB01A9CC02C4}
+		{3752E6AE-0EBD-4A82-9FCF-375A39F99F0F} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+		{4BB9602E-5233-4399-A4B5-D4E8AD38741B} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+		{76656E96-A647-4098-934D-8F752A3F2FD6} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+		{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+		{27EB8901-D9CB-4814-8565-8D2CE564F2C8} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+		{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+		{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A} = {734D4174-F73E-46A0-B379-BB9FDD25C0FB}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{657CD674-B225-4D8B-BFF0-41F4B0203FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{657CD674-B225-4D8B-BFF0-41F4B0203FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{657CD674-B225-4D8B-BFF0-41F4B0203FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{657CD674-B225-4D8B-BFF0-41F4B0203FB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2A8DAEB6-95DE-47F1-88E0-42675279FD87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C93CA38A-6881-4A73-B1C8-033474857135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C93CA38A-6881-4A73-B1C8-033474857135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C93CA38A-6881-4A73-B1C8-033474857135}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C93CA38A-6881-4A73-B1C8-033474857135}.Release|Any CPU.Build.0 = Release|Any CPU
+		{119684C3-F2BF-440E-A832-1ACA0D007F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{119684C3-F2BF-440E-A832-1ACA0D007F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{119684C3-F2BF-440E-A832-1ACA0D007F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{119684C3-F2BF-440E-A832-1ACA0D007F58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3752E6AE-0EBD-4A82-9FCF-375A39F99F0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3752E6AE-0EBD-4A82-9FCF-375A39F99F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3752E6AE-0EBD-4A82-9FCF-375A39F99F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3752E6AE-0EBD-4A82-9FCF-375A39F99F0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42A9FDD2-A38C-4F44-A91A-9E2C5D6C97FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42A9FDD2-A38C-4F44-A91A-9E2C5D6C97FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42A9FDD2-A38C-4F44-A91A-9E2C5D6C97FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42A9FDD2-A38C-4F44-A91A-9E2C5D6C97FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BB9602E-5233-4399-A4B5-D4E8AD38741B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BB9602E-5233-4399-A4B5-D4E8AD38741B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BB9602E-5233-4399-A4B5-D4E8AD38741B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BB9602E-5233-4399-A4B5-D4E8AD38741B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52D93DFA-9CC9-4C5B-9A37-46391B04E61F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52D93DFA-9CC9-4C5B-9A37-46391B04E61F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52D93DFA-9CC9-4C5B-9A37-46391B04E61F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52D93DFA-9CC9-4C5B-9A37-46391B04E61F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76656E96-A647-4098-934D-8F752A3F2FD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76656E96-A647-4098-934D-8F752A3F2FD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76656E96-A647-4098-934D-8F752A3F2FD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76656E96-A647-4098-934D-8F752A3F2FD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BFDB74F-44FE-4521-86A7-AB52FB261AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BFDB74F-44FE-4521-86A7-AB52FB261AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BFDB74F-44FE-4521-86A7-AB52FB261AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BFDB74F-44FE-4521-86A7-AB52FB261AA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15B92D3C-B29E-488B-90FC-324167935409}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15B92D3C-B29E-488B-90FC-324167935409}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15B92D3C-B29E-488B-90FC-324167935409}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15B92D3C-B29E-488B-90FC-324167935409}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EF3E081-1D2F-40CC-B2B1-C7F05E261C21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40653EBF-E569-4F85-843D-FFABBB70CFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40653EBF-E569-4F85-843D-FFABBB70CFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40653EBF-E569-4F85-843D-FFABBB70CFC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40653EBF-E569-4F85-843D-FFABBB70CFC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27EB8901-D9CB-4814-8565-8D2CE564F2C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27EB8901-D9CB-4814-8565-8D2CE564F2C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27EB8901-D9CB-4814-8565-8D2CE564F2C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27EB8901-D9CB-4814-8565-8D2CE564F2C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{384EE35D-2668-42B6-8615-6BD6C4AA5273}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{384EE35D-2668-42B6-8615-6BD6C4AA5273}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{384EE35D-2668-42B6-8615-6BD6C4AA5273}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{384EE35D-2668-42B6-8615-6BD6C4AA5273}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD7282C4-85F7-4C0F-9E43-1EC487A5FD20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{140853AE-EDA5-4914-951A-8323918A9A11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{140853AE-EDA5-4914-951A-8323918A9A11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{140853AE-EDA5-4914-951A-8323918A9A11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{140853AE-EDA5-4914-951A-8323918A9A11}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3746E645-BFCF-4EF1-88E1-CF0D27805608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3746E645-BFCF-4EF1-88E1-CF0D27805608}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3746E645-BFCF-4EF1-88E1-CF0D27805608}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3746E645-BFCF-4EF1-88E1-CF0D27805608}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B80D92B7-1A9E-4E1E-A56A-D6B940D8B81A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DC76A30-E31B-42C2-AA6B-F022FFA49BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DC76A30-E31B-42C2-AA6B-F022FFA49BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DC76A30-E31B-42C2-AA6B-F022FFA49BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DC76A30-E31B-42C2-AA6B-F022FFA49BAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4907F731-1D47-46A8-9FBD-7AD0457BE47F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4907F731-1D47-46A8-9FBD-7AD0457BE47F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4907F731-1D47-46A8-9FBD-7AD0457BE47F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4907F731-1D47-46A8-9FBD-7AD0457BE47F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{657CD674-B225-4D8B-BFF0-41F4B0203FB5} = {BDE47CA9-FA28-4B80-97AD-C1ADA07E109F}
-		{D5F9AD72-D55D-4110-8FB4-9340A1DDE7B9} = {1E7E6E50-5748-4E9A-A36D-5DFF485957A3}
-		{2A8DAEB6-95DE-47F1-88E0-42675279FD87} = {9361978B-A180-4DC2-AD57-82D7B94964CD}
-		{84B6A2DB-2E4B-49B7-98B0-B4032A04585C} = {9361978B-A180-4DC2-AD57-82D7B94964CD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1ACDC382-2E7D-462F-8373-7D106D8A0244}
+		SolutionGuid = {B21C5DA8-5B94-485F-913D-CDF943AFCAD6}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
index 8e717be4d37f11..5435ae5ee08a18 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.sln
@@ -1,55 +1,156 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D35C3BB9-F9D1-409E-968F-D73563B3FC36}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{328F0E28-A9B5-4E90-9AD8-7D5AC9C025DD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{82C89D4E-F7EB-45D4-AC9F-BB952B620767}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{6D6D00B2-16CB-4DB9-ABC6-50729E23682D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BB7360F9-FD16-4E3A-9FE9-9870B97A49BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{44801F6B-40D0-4640-A749-3F5E6203CF94}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "ref\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{E36A657C-4A6E-4C47-9D1E-51D32C00C52D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{8B80B611-3EA2-45E1-9148-98F5D3C98390}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{598A83F4-1A18-4814-BC48-E536FA378004}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{64E40C62-4177-4F27-8C5C-C876E38103A6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Tests", "tests\Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj", "{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "ref\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{F5FC3D96-3279-4707-8C6B-CE553D8BE72E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Tests", "tests\Microsoft.Extensions.Configuration.EnvironmentVariables.Tests.csproj", "{F617884E-D411-4286-A620-53E25C538373}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{B0677DDD-392C-4E79-9A80-ACCDCC5302F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{618DB5A3-A158-4F25-9A81-9F35909506E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{114BFD58-B1E4-49C0-A176-268710DD898A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{70AE0C61-0BCA-4D93-BD42-514A83E4D7FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{627594A7-2545-4CDA-8B91-890D3CB46E3A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{595B9904-FEEB-429A-BF89-F46081047BCA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{171519BA-C402-43A8-9F72-A943B5275E6F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{260EA755-D57B-4157-893D-7AAAFEF2C790}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B938CAC2-76E4-4689-8AED-5E5250A1FD1B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E725D521-0348-4EAD-9A34-05546835FF2F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{36AE97D2-7B56-4666-9670-258177CCA836}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5C6CA1D7-6839-41C1-819D-E8764284CD18}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{328F0E28-A9B5-4E90-9AD8-7D5AC9C025DD} = {E725D521-0348-4EAD-9A34-05546835FF2F}
+		{F617884E-D411-4286-A620-53E25C538373} = {E725D521-0348-4EAD-9A34-05546835FF2F}
+		{6D6D00B2-16CB-4DB9-ABC6-50729E23682D} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{8B80B611-3EA2-45E1-9148-98F5D3C98390} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{F5FC3D96-3279-4707-8C6B-CE553D8BE72E} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{B0677DDD-392C-4E79-9A80-ACCDCC5302F1} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{114BFD58-B1E4-49C0-A176-268710DD898A} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{70AE0C61-0BCA-4D93-BD42-514A83E4D7FF} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{627594A7-2545-4CDA-8B91-890D3CB46E3A} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{595B9904-FEEB-429A-BF89-F46081047BCA} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{260EA755-D57B-4157-893D-7AAAFEF2C790} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{B938CAC2-76E4-4689-8AED-5E5250A1FD1B} = {36AE97D2-7B56-4666-9670-258177CCA836}
+		{44801F6B-40D0-4640-A749-3F5E6203CF94} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+		{64E40C62-4177-4F27-8C5C-C876E38103A6} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+		{EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+		{618DB5A3-A158-4F25-9A81-9F35909506E6} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+		{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+		{73CB2C25-1A22-479C-9FC0-CE65BFE272DB} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+		{171519BA-C402-43A8-9F72-A943B5275E6F} = {5C6CA1D7-6839-41C1-819D-E8764284CD18}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E36A657C-4A6E-4C47-9D1E-51D32C00C52D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E36A657C-4A6E-4C47-9D1E-51D32C00C52D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E36A657C-4A6E-4C47-9D1E-51D32C00C52D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E36A657C-4A6E-4C47-9D1E-51D32C00C52D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{598A83F4-1A18-4814-BC48-E536FA378004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{598A83F4-1A18-4814-BC48-E536FA378004}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{598A83F4-1A18-4814-BC48-E536FA378004}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{598A83F4-1A18-4814-BC48-E536FA378004}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{328F0E28-A9B5-4E90-9AD8-7D5AC9C025DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{328F0E28-A9B5-4E90-9AD8-7D5AC9C025DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{328F0E28-A9B5-4E90-9AD8-7D5AC9C025DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{328F0E28-A9B5-4E90-9AD8-7D5AC9C025DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D6D00B2-16CB-4DB9-ABC6-50729E23682D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D6D00B2-16CB-4DB9-ABC6-50729E23682D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D6D00B2-16CB-4DB9-ABC6-50729E23682D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D6D00B2-16CB-4DB9-ABC6-50729E23682D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44801F6B-40D0-4640-A749-3F5E6203CF94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44801F6B-40D0-4640-A749-3F5E6203CF94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44801F6B-40D0-4640-A749-3F5E6203CF94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44801F6B-40D0-4640-A749-3F5E6203CF94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B80B611-3EA2-45E1-9148-98F5D3C98390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B80B611-3EA2-45E1-9148-98F5D3C98390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B80B611-3EA2-45E1-9148-98F5D3C98390}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B80B611-3EA2-45E1-9148-98F5D3C98390}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64E40C62-4177-4F27-8C5C-C876E38103A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64E40C62-4177-4F27-8C5C-C876E38103A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64E40C62-4177-4F27-8C5C-C876E38103A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64E40C62-4177-4F27-8C5C-C876E38103A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5FC3D96-3279-4707-8C6B-CE553D8BE72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5FC3D96-3279-4707-8C6B-CE553D8BE72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5FC3D96-3279-4707-8C6B-CE553D8BE72E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5FC3D96-3279-4707-8C6B-CE553D8BE72E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBEBE22F-F8AF-4976-B8B8-0A0A1C4065B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F617884E-D411-4286-A620-53E25C538373}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F617884E-D411-4286-A620-53E25C538373}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F617884E-D411-4286-A620-53E25C538373}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F617884E-D411-4286-A620-53E25C538373}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0677DDD-392C-4E79-9A80-ACCDCC5302F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0677DDD-392C-4E79-9A80-ACCDCC5302F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0677DDD-392C-4E79-9A80-ACCDCC5302F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0677DDD-392C-4E79-9A80-ACCDCC5302F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{618DB5A3-A158-4F25-9A81-9F35909506E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{618DB5A3-A158-4F25-9A81-9F35909506E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{618DB5A3-A158-4F25-9A81-9F35909506E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{618DB5A3-A158-4F25-9A81-9F35909506E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{114BFD58-B1E4-49C0-A176-268710DD898A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{114BFD58-B1E4-49C0-A176-268710DD898A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{114BFD58-B1E4-49C0-A176-268710DD898A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{114BFD58-B1E4-49C0-A176-268710DD898A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D1CF09A-2A49-4F79-89F3-C04EC00FFC32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70AE0C61-0BCA-4D93-BD42-514A83E4D7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70AE0C61-0BCA-4D93-BD42-514A83E4D7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70AE0C61-0BCA-4D93-BD42-514A83E4D7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70AE0C61-0BCA-4D93-BD42-514A83E4D7FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73CB2C25-1A22-479C-9FC0-CE65BFE272DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{627594A7-2545-4CDA-8B91-890D3CB46E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{627594A7-2545-4CDA-8B91-890D3CB46E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{627594A7-2545-4CDA-8B91-890D3CB46E3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{627594A7-2545-4CDA-8B91-890D3CB46E3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{595B9904-FEEB-429A-BF89-F46081047BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{595B9904-FEEB-429A-BF89-F46081047BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{595B9904-FEEB-429A-BF89-F46081047BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{595B9904-FEEB-429A-BF89-F46081047BCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{171519BA-C402-43A8-9F72-A943B5275E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{171519BA-C402-43A8-9F72-A943B5275E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{171519BA-C402-43A8-9F72-A943B5275E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{171519BA-C402-43A8-9F72-A943B5275E6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{260EA755-D57B-4157-893D-7AAAFEF2C790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{260EA755-D57B-4157-893D-7AAAFEF2C790}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{260EA755-D57B-4157-893D-7AAAFEF2C790}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{260EA755-D57B-4157-893D-7AAAFEF2C790}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B938CAC2-76E4-4689-8AED-5E5250A1FD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B938CAC2-76E4-4689-8AED-5E5250A1FD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B938CAC2-76E4-4689-8AED-5E5250A1FD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B938CAC2-76E4-4689-8AED-5E5250A1FD1B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E36A657C-4A6E-4C47-9D1E-51D32C00C52D} = {D35C3BB9-F9D1-409E-968F-D73563B3FC36}
-		{598A83F4-1A18-4814-BC48-E536FA378004} = {82C89D4E-F7EB-45D4-AC9F-BB952B620767}
-		{3BEF9DD3-9E82-49B6-A06E-1A899ED2FD93} = {BB7360F9-FD16-4E3A-9FE9-9870B97A49BB}
-		{8EDC3CC7-BF43-43F4-ABE0-FFEB7D68FE52} = {BB7360F9-FD16-4E3A-9FE9-9870B97A49BB}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BF2C57DF-CD27-4C93-A689-19A72E6FC5B4}
+		SolutionGuid = {FD52C33A-D95E-4E76-B817-12A125C4418A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
index 3149273d17c700..01ac3cb3a82d11 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.sln
@@ -1,55 +1,170 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{368FB595-071C-445D-A56B-88781300D2B7}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{565961C5-FF76-474B-9662-206BA630BF70}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C64296E-E07A-41E3-BE26-AF909F556B1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{55489DCB-3CD4-40CD-81A8-00945029C8E2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C31D33A1-28EE-4C1E-A859-5D8154527838}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{4C97A79C-D5A5-4091-9A3A-3426BD7FF277}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{AEC76790-0008-4755-A097-77E52F7EE38C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{B9A42BBD-0B29-45A1-9482-61A0D683FEA7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{B1C9D55F-73E4-425F-ACCE-05E286CCF93B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions.Tests", "tests\Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj", "{50FBFD93-356A-4439-97A3-592A066D23A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions.Tests", "tests\Microsoft.Extensions.Configuration.FileExtensions.Tests.csproj", "{3D3F1D99-FE2E-4910-9906-9DF36A415981}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8D869833-69B7-4C0B-A13B-D3073EE2D912}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{95EB26AA-E1DA-4E31-BB37-6C1F50F4B023}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{5A242B96-3C69-456B-B4EA-969E6EE91C5C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{EC8DDB1C-B124-4070-9202-13A665C2FF29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{FC52A2D5-BBDA-4E30-8AC8-373991137059}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{8370539D-02B1-4D8E-B44B-0E845AED1B8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{D49BC1CE-AE45-47D1-A662-9F4C0300930D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{A024CB01-C41F-4F2C-87B1-5E3B3D2979A3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{7E4BF22A-B413-40E4-88C9-6579502B17F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{96F56B6D-B82D-433A-95CB-A35179529934}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1F671DF9-9390-4A15-93B6-AD483D8E9559}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3E459CAE-C23F-4467-9845-F35943928C41}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{4183C46E-330D-4B03-A430-7F472EAE4C3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{046A290C-5C55-4E2B-BA4D-6FB4AABF95CB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40ACF4DB-FFCD-48F2-BEE0-121EC41B7C72}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B012E0D0-D34D-4948-84E4-131F93B25BA5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{565961C5-FF76-474B-9662-206BA630BF70} = {40ACF4DB-FFCD-48F2-BEE0-121EC41B7C72}
+		{3D3F1D99-FE2E-4910-9906-9DF36A415981} = {40ACF4DB-FFCD-48F2-BEE0-121EC41B7C72}
+		{55489DCB-3CD4-40CD-81A8-00945029C8E2} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{B9A42BBD-0B29-45A1-9482-61A0D683FEA7} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{95EB26AA-E1DA-4E31-BB37-6C1F50F4B023} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{EC8DDB1C-B124-4070-9202-13A665C2FF29} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{8370539D-02B1-4D8E-B44B-0E845AED1B8E} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{A024CB01-C41F-4F2C-87B1-5E3B3D2979A3} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{1F671DF9-9390-4A15-93B6-AD483D8E9559} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{4183C46E-330D-4B03-A430-7F472EAE4C3B} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{046A290C-5C55-4E2B-BA4D-6FB4AABF95CB} = {059E3B0D-10D1-4E99-8B4A-2024F0AFBD55}
+		{4C97A79C-D5A5-4091-9A3A-3426BD7FF277} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{B1C9D55F-73E4-425F-ACCE-05E286CCF93B} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{5A242B96-3C69-456B-B4EA-969E6EE91C5C} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{FC52A2D5-BBDA-4E30-8AC8-373991137059} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{D49BC1CE-AE45-47D1-A662-9F4C0300930D} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{7E4BF22A-B413-40E4-88C9-6579502B17F9} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{96F56B6D-B82D-433A-95CB-A35179529934} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+		{3E459CAE-C23F-4467-9845-F35943928C41} = {B012E0D0-D34D-4948-84E4-131F93B25BA5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AEC76790-0008-4755-A097-77E52F7EE38C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEC76790-0008-4755-A097-77E52F7EE38C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEC76790-0008-4755-A097-77E52F7EE38C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEC76790-0008-4755-A097-77E52F7EE38C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50FBFD93-356A-4439-97A3-592A066D23A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50FBFD93-356A-4439-97A3-592A066D23A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50FBFD93-356A-4439-97A3-592A066D23A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50FBFD93-356A-4439-97A3-592A066D23A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D869833-69B7-4C0B-A13B-D3073EE2D912}.Release|Any CPU.Build.0 = Release|Any CPU
+		{565961C5-FF76-474B-9662-206BA630BF70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{565961C5-FF76-474B-9662-206BA630BF70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{565961C5-FF76-474B-9662-206BA630BF70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{565961C5-FF76-474B-9662-206BA630BF70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55489DCB-3CD4-40CD-81A8-00945029C8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55489DCB-3CD4-40CD-81A8-00945029C8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55489DCB-3CD4-40CD-81A8-00945029C8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55489DCB-3CD4-40CD-81A8-00945029C8E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C97A79C-D5A5-4091-9A3A-3426BD7FF277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C97A79C-D5A5-4091-9A3A-3426BD7FF277}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C97A79C-D5A5-4091-9A3A-3426BD7FF277}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C97A79C-D5A5-4091-9A3A-3426BD7FF277}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9A42BBD-0B29-45A1-9482-61A0D683FEA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9A42BBD-0B29-45A1-9482-61A0D683FEA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9A42BBD-0B29-45A1-9482-61A0D683FEA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9A42BBD-0B29-45A1-9482-61A0D683FEA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1C9D55F-73E4-425F-ACCE-05E286CCF93B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1C9D55F-73E4-425F-ACCE-05E286CCF93B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1C9D55F-73E4-425F-ACCE-05E286CCF93B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1C9D55F-73E4-425F-ACCE-05E286CCF93B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D3F1D99-FE2E-4910-9906-9DF36A415981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D3F1D99-FE2E-4910-9906-9DF36A415981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D3F1D99-FE2E-4910-9906-9DF36A415981}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D3F1D99-FE2E-4910-9906-9DF36A415981}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95EB26AA-E1DA-4E31-BB37-6C1F50F4B023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95EB26AA-E1DA-4E31-BB37-6C1F50F4B023}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95EB26AA-E1DA-4E31-BB37-6C1F50F4B023}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95EB26AA-E1DA-4E31-BB37-6C1F50F4B023}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A242B96-3C69-456B-B4EA-969E6EE91C5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A242B96-3C69-456B-B4EA-969E6EE91C5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A242B96-3C69-456B-B4EA-969E6EE91C5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A242B96-3C69-456B-B4EA-969E6EE91C5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC8DDB1C-B124-4070-9202-13A665C2FF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC8DDB1C-B124-4070-9202-13A665C2FF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC8DDB1C-B124-4070-9202-13A665C2FF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC8DDB1C-B124-4070-9202-13A665C2FF29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC52A2D5-BBDA-4E30-8AC8-373991137059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC52A2D5-BBDA-4E30-8AC8-373991137059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC52A2D5-BBDA-4E30-8AC8-373991137059}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC52A2D5-BBDA-4E30-8AC8-373991137059}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8370539D-02B1-4D8E-B44B-0E845AED1B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8370539D-02B1-4D8E-B44B-0E845AED1B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8370539D-02B1-4D8E-B44B-0E845AED1B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8370539D-02B1-4D8E-B44B-0E845AED1B8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D49BC1CE-AE45-47D1-A662-9F4C0300930D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D49BC1CE-AE45-47D1-A662-9F4C0300930D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D49BC1CE-AE45-47D1-A662-9F4C0300930D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D49BC1CE-AE45-47D1-A662-9F4C0300930D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A024CB01-C41F-4F2C-87B1-5E3B3D2979A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A024CB01-C41F-4F2C-87B1-5E3B3D2979A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A024CB01-C41F-4F2C-87B1-5E3B3D2979A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A024CB01-C41F-4F2C-87B1-5E3B3D2979A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E4BF22A-B413-40E4-88C9-6579502B17F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E4BF22A-B413-40E4-88C9-6579502B17F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E4BF22A-B413-40E4-88C9-6579502B17F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E4BF22A-B413-40E4-88C9-6579502B17F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5E5E0E3-F2FF-405B-AD0D-7D92C6F85F4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96F56B6D-B82D-433A-95CB-A35179529934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96F56B6D-B82D-433A-95CB-A35179529934}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96F56B6D-B82D-433A-95CB-A35179529934}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96F56B6D-B82D-433A-95CB-A35179529934}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F671DF9-9390-4A15-93B6-AD483D8E9559}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F671DF9-9390-4A15-93B6-AD483D8E9559}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F671DF9-9390-4A15-93B6-AD483D8E9559}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F671DF9-9390-4A15-93B6-AD483D8E9559}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F292F90B-FB0A-4EE5-8F8A-3CF24E22F914}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E459CAE-C23F-4467-9845-F35943928C41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E459CAE-C23F-4467-9845-F35943928C41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E459CAE-C23F-4467-9845-F35943928C41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E459CAE-C23F-4467-9845-F35943928C41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4183C46E-330D-4B03-A430-7F472EAE4C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4183C46E-330D-4B03-A430-7F472EAE4C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4183C46E-330D-4B03-A430-7F472EAE4C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4183C46E-330D-4B03-A430-7F472EAE4C3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{046A290C-5C55-4E2B-BA4D-6FB4AABF95CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{046A290C-5C55-4E2B-BA4D-6FB4AABF95CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{046A290C-5C55-4E2B-BA4D-6FB4AABF95CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{046A290C-5C55-4E2B-BA4D-6FB4AABF95CB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AEC76790-0008-4755-A097-77E52F7EE38C} = {368FB595-071C-445D-A56B-88781300D2B7}
-		{1A6B0717-13B3-4F15-AD71-5BE3FEE0F9DC} = {3C64296E-E07A-41E3-BE26-AF909F556B1B}
-		{50FBFD93-356A-4439-97A3-592A066D23A8} = {C31D33A1-28EE-4C1E-A859-5D8154527838}
-		{8D869833-69B7-4C0B-A13B-D3073EE2D912} = {C31D33A1-28EE-4C1E-A859-5D8154527838}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DB6ECFE5-FAD1-4F02-A143-0A39A506ED11}
+		SolutionGuid = {9E1D104F-EEB9-457A-9942-83E43C869D8C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln b/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
index a615fdf6906fba..7d561d55db0a57 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.sln
@@ -1,55 +1,198 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8EF05751-E815-46ED-A495-4F38C40AF8DB}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7DE12855-FAEE-4AAC-A4A7-EC6308F47B4E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{34CD290F-ED23-4066-97D3-3D37E8658E1D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{480E7F63-E37F-4971-953E-1F4FAA8A667C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2474302E-ABBF-4B9C-832F-1C3DF82C4769}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{98B116B8-2D6A-4AC1-925E-FA5E1F09247E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "ref\Microsoft.Extensions.Configuration.Ini.csproj", "{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{A7E67FF3-ED3E-4CB8-B1D9-5F98C443E763}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "src\Microsoft.Extensions.Configuration.Ini.csproj", "{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{8A6B8D35-1C22-46AB-8C68-F31656337762}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini.Tests", "tests\Microsoft.Extensions.Configuration.Ini.Tests.csproj", "{85280091-78E2-4558-B6AB-F30B4F92BCF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{7C8B43D4-493B-4FB1-9E9D-9D3476252CE8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1271138D-3837-4315-A3B4-E085DCD61FBC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{D3A401F7-2C54-45C4-BFF1-45269B2FA1EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "ref\Microsoft.Extensions.Configuration.Ini.csproj", "{BC1A82AA-4860-413B-B6B5-7748A2D2BEC4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "src\Microsoft.Extensions.Configuration.Ini.csproj", "{7DA324A1-FA9F-4B8A-B8C3-7F6707D77B52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini.Tests", "tests\Microsoft.Extensions.Configuration.Ini.Tests.csproj", "{506EB478-5BD7-4AFC-BA42-A6DA14C112A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{111A3628-305F-4360-BCB9-E295072864E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{A4C1F4E8-66C1-4344-BCD8-E69DD6A35975}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{742411BC-34E4-45ED-A9C4-D7C507B062D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{0A1E4D1C-A369-42D5-B852-6B1876DE8D8B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{B2CEF482-0EBB-42EC-A37B-786492049E78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{92259CBF-FAC1-40F1-987E-DBF7631977EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{6260945D-105D-47CC-B256-D62BF3CA9448}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{B46B056A-EFA3-4AF7-9CE3-B62EDEABE286}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{3FAB6852-68A1-4317-B972-6B8088AB6DCF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E70CC1DE-58F1-40BE-A784-1128D99DEA5E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9882F79B-592C-4E76-BDF4-50C030F67F0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F241C7D3-E80F-4C69-8418-4501DB1331B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B71D0BB4-70EA-40B0-A964-833B63EC8A52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{39CB6083-CA32-4DD5-B805-ED43C45CD998}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7D6F7151-EA44-4448-9D53-CF446FE75991}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{38B033CD-0F62-4BC3-A1A2-1A026891DC5E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7DE12855-FAEE-4AAC-A4A7-EC6308F47B4E} = {7D6F7151-EA44-4448-9D53-CF446FE75991}
+		{506EB478-5BD7-4AFC-BA42-A6DA14C112A8} = {7D6F7151-EA44-4448-9D53-CF446FE75991}
+		{480E7F63-E37F-4971-953E-1F4FAA8A667C} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{A7E67FF3-ED3E-4CB8-B1D9-5F98C443E763} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{7C8B43D4-493B-4FB1-9E9D-9D3476252CE8} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{BC1A82AA-4860-413B-B6B5-7748A2D2BEC4} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{111A3628-305F-4360-BCB9-E295072864E2} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{742411BC-34E4-45ED-A9C4-D7C507B062D9} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{B2CEF482-0EBB-42EC-A37B-786492049E78} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{6260945D-105D-47CC-B256-D62BF3CA9448} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{B46B056A-EFA3-4AF7-9CE3-B62EDEABE286} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{E70CC1DE-58F1-40BE-A784-1128D99DEA5E} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{9882F79B-592C-4E76-BDF4-50C030F67F0E} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{B71D0BB4-70EA-40B0-A964-833B63EC8A52} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{39CB6083-CA32-4DD5-B805-ED43C45CD998} = {CE2EC44C-19EC-4D3C-8AE8-03208863C3A4}
+		{98B116B8-2D6A-4AC1-925E-FA5E1F09247E} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{8A6B8D35-1C22-46AB-8C68-F31656337762} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{D3A401F7-2C54-45C4-BFF1-45269B2FA1EF} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{7DA324A1-FA9F-4B8A-B8C3-7F6707D77B52} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{A4C1F4E8-66C1-4344-BCD8-E69DD6A35975} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{0A1E4D1C-A369-42D5-B852-6B1876DE8D8B} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{92259CBF-FAC1-40F1-987E-DBF7631977EC} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{3FAB6852-68A1-4317-B972-6B8088AB6DCF} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+		{F241C7D3-E80F-4C69-8418-4501DB1331B8} = {38B033CD-0F62-4BC3-A1A2-1A026891DC5E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85280091-78E2-4558-B6AB-F30B4F92BCF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1271138D-3837-4315-A3B4-E085DCD61FBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DE12855-FAEE-4AAC-A4A7-EC6308F47B4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DE12855-FAEE-4AAC-A4A7-EC6308F47B4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DE12855-FAEE-4AAC-A4A7-EC6308F47B4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DE12855-FAEE-4AAC-A4A7-EC6308F47B4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{480E7F63-E37F-4971-953E-1F4FAA8A667C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{480E7F63-E37F-4971-953E-1F4FAA8A667C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{480E7F63-E37F-4971-953E-1F4FAA8A667C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{480E7F63-E37F-4971-953E-1F4FAA8A667C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98B116B8-2D6A-4AC1-925E-FA5E1F09247E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98B116B8-2D6A-4AC1-925E-FA5E1F09247E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98B116B8-2D6A-4AC1-925E-FA5E1F09247E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98B116B8-2D6A-4AC1-925E-FA5E1F09247E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7E67FF3-ED3E-4CB8-B1D9-5F98C443E763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7E67FF3-ED3E-4CB8-B1D9-5F98C443E763}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7E67FF3-ED3E-4CB8-B1D9-5F98C443E763}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7E67FF3-ED3E-4CB8-B1D9-5F98C443E763}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A6B8D35-1C22-46AB-8C68-F31656337762}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A6B8D35-1C22-46AB-8C68-F31656337762}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A6B8D35-1C22-46AB-8C68-F31656337762}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A6B8D35-1C22-46AB-8C68-F31656337762}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C8B43D4-493B-4FB1-9E9D-9D3476252CE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C8B43D4-493B-4FB1-9E9D-9D3476252CE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C8B43D4-493B-4FB1-9E9D-9D3476252CE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C8B43D4-493B-4FB1-9E9D-9D3476252CE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3A401F7-2C54-45C4-BFF1-45269B2FA1EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3A401F7-2C54-45C4-BFF1-45269B2FA1EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3A401F7-2C54-45C4-BFF1-45269B2FA1EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3A401F7-2C54-45C4-BFF1-45269B2FA1EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC1A82AA-4860-413B-B6B5-7748A2D2BEC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC1A82AA-4860-413B-B6B5-7748A2D2BEC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC1A82AA-4860-413B-B6B5-7748A2D2BEC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC1A82AA-4860-413B-B6B5-7748A2D2BEC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DA324A1-FA9F-4B8A-B8C3-7F6707D77B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DA324A1-FA9F-4B8A-B8C3-7F6707D77B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DA324A1-FA9F-4B8A-B8C3-7F6707D77B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DA324A1-FA9F-4B8A-B8C3-7F6707D77B52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{506EB478-5BD7-4AFC-BA42-A6DA14C112A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{506EB478-5BD7-4AFC-BA42-A6DA14C112A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{506EB478-5BD7-4AFC-BA42-A6DA14C112A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{506EB478-5BD7-4AFC-BA42-A6DA14C112A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{111A3628-305F-4360-BCB9-E295072864E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{111A3628-305F-4360-BCB9-E295072864E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{111A3628-305F-4360-BCB9-E295072864E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{111A3628-305F-4360-BCB9-E295072864E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4C1F4E8-66C1-4344-BCD8-E69DD6A35975}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4C1F4E8-66C1-4344-BCD8-E69DD6A35975}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4C1F4E8-66C1-4344-BCD8-E69DD6A35975}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4C1F4E8-66C1-4344-BCD8-E69DD6A35975}.Release|Any CPU.Build.0 = Release|Any CPU
+		{742411BC-34E4-45ED-A9C4-D7C507B062D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{742411BC-34E4-45ED-A9C4-D7C507B062D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{742411BC-34E4-45ED-A9C4-D7C507B062D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{742411BC-34E4-45ED-A9C4-D7C507B062D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A1E4D1C-A369-42D5-B852-6B1876DE8D8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A1E4D1C-A369-42D5-B852-6B1876DE8D8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A1E4D1C-A369-42D5-B852-6B1876DE8D8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A1E4D1C-A369-42D5-B852-6B1876DE8D8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2CEF482-0EBB-42EC-A37B-786492049E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2CEF482-0EBB-42EC-A37B-786492049E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2CEF482-0EBB-42EC-A37B-786492049E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2CEF482-0EBB-42EC-A37B-786492049E78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92259CBF-FAC1-40F1-987E-DBF7631977EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92259CBF-FAC1-40F1-987E-DBF7631977EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92259CBF-FAC1-40F1-987E-DBF7631977EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92259CBF-FAC1-40F1-987E-DBF7631977EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6260945D-105D-47CC-B256-D62BF3CA9448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6260945D-105D-47CC-B256-D62BF3CA9448}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6260945D-105D-47CC-B256-D62BF3CA9448}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6260945D-105D-47CC-B256-D62BF3CA9448}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3FA11C3-612D-4F2B-9A2B-5D3FDCF1C077}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B46B056A-EFA3-4AF7-9CE3-B62EDEABE286}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B46B056A-EFA3-4AF7-9CE3-B62EDEABE286}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B46B056A-EFA3-4AF7-9CE3-B62EDEABE286}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B46B056A-EFA3-4AF7-9CE3-B62EDEABE286}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3FAB6852-68A1-4317-B972-6B8088AB6DCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E70CC1DE-58F1-40BE-A784-1128D99DEA5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E70CC1DE-58F1-40BE-A784-1128D99DEA5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E70CC1DE-58F1-40BE-A784-1128D99DEA5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E70CC1DE-58F1-40BE-A784-1128D99DEA5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9882F79B-592C-4E76-BDF4-50C030F67F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9882F79B-592C-4E76-BDF4-50C030F67F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9882F79B-592C-4E76-BDF4-50C030F67F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9882F79B-592C-4E76-BDF4-50C030F67F0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F241C7D3-E80F-4C69-8418-4501DB1331B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F241C7D3-E80F-4C69-8418-4501DB1331B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F241C7D3-E80F-4C69-8418-4501DB1331B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F241C7D3-E80F-4C69-8418-4501DB1331B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B71D0BB4-70EA-40B0-A964-833B63EC8A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B71D0BB4-70EA-40B0-A964-833B63EC8A52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B71D0BB4-70EA-40B0-A964-833B63EC8A52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B71D0BB4-70EA-40B0-A964-833B63EC8A52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39CB6083-CA32-4DD5-B805-ED43C45CD998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39CB6083-CA32-4DD5-B805-ED43C45CD998}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39CB6083-CA32-4DD5-B805-ED43C45CD998}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39CB6083-CA32-4DD5-B805-ED43C45CD998}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7E5EF3B6-FF5A-4536-9A3C-4A9288F69ABE} = {8EF05751-E815-46ED-A495-4F38C40AF8DB}
-		{B5665E0B-EF8D-4A3F-9CDC-FCD1B0F4A784} = {34CD290F-ED23-4066-97D3-3D37E8658E1D}
-		{85280091-78E2-4558-B6AB-F30B4F92BCF7} = {2474302E-ABBF-4B9C-832F-1C3DF82C4769}
-		{1271138D-3837-4315-A3B4-E085DCD61FBC} = {2474302E-ABBF-4B9C-832F-1C3DF82C4769}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E4A50DE9-C0E3-44CC-A3DD-45A49DFFDCD3}
+		SolutionGuid = {4D8FAA33-E9C8-48FB-ADBF-5AE1D87E9B2C}
 	EndGlobalSection
 EndGlobal
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 1dd77a63d69d9b..efe53b0656c66e 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
@@ -1,55 +1,226 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DDBAD8C5-F7BE-4EB7-9B1F-AD8CAE548DB3}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8163E80F-4982-4BC2-A0AA-FF1284E62964}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{78219FF4-C28B-4EA4-B0F9-B5467296A267}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "ref\Microsoft.Extensions.Configuration.Json.csproj", "{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{68210977-E10C-4BC3-B235-31B6E2AF9830}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "src\Microsoft.Extensions.Configuration.Json.csproj", "{1B86310E-A8A9-497B-BA92-BB9E273DC1CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{5374E4B3-FFA0-47E3-9400-C086E6C236CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EFA97506-2078-4F34-9491-9C300446FA64}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{B5018015-F6E7-404B-99C5-980FF8298832}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json.Tests", "tests\Microsoft.Extensions.Configuration.Json.Tests.csproj", "{328889E2-78ED-4774-83FB-188BABA34FB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{0D650281-5B86-4A2C-9D09-41BD3846B072}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{14C31A82-8817-44FF-A28B-9B05797FDC4C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{01CEF916-5FF9-4566-A507-08FD019E04F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{4DD667F9-B4EB-47DE-B5FF-6B30442AE921}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{405D047F-59EB-47FA-A32D-FA4F5B97D5D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "ref\Microsoft.Extensions.Configuration.Json.csproj", "{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "src\Microsoft.Extensions.Configuration.Json.csproj", "{6D8F8AC7-027F-4DB9-9299-4F3873310B8F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json.Tests", "tests\Microsoft.Extensions.Configuration.Json.Tests.csproj", "{9F495CC2-5325-4F18-831C-8DEFB2F89206}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{7D798B08-E806-4D50-A103-4F8F0F78770D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{263497F5-8AAC-4E15-97EC-4871E1E9606F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{9355C322-9769-418B-9B00-09EF8E96D263}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{B059E91C-DA44-46BB-BD06-D208258ED8E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{9B6760CA-AC54-4549-9EA1-823BDF841BCA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{6A80D098-69EC-45FE-A064-4CBDFA44BA43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{4C29E3A6-45F5-4747-B471-A48EFDF88247}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{FE50757B-7862-49D2-812E-1646F6FE0070}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{F468EC97-5E8E-46F3-87A2-D2DEE53B4605}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{B1723D4C-15E3-4A39-8976-C3E1740E5F00}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{791342A3-DA08-4775-8CC6-236D8769A805}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B9E03474-32B9-4D49-BF6F-2F17DAE8D699}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A5591BC5-7A1C-4FBA-8C38-D46D3664D713}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{76EF09ED-019E-4A1B-BFF5-509E8AA691AD}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{A49023C8-173A-4B8F-84B3-2FF37FE8344A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{46055324-336F-4046-ADF9-1DFCA282C10F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{34884E6F-5C79-4F3C-9D96-6118E099FE6D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D3EE813-3F89-425D-B092-7B992662C45B}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C5D6F2B2-670F-42F8-98CB-B37CAC2E5D38} = {46055324-336F-4046-ADF9-1DFCA282C10F}
+		{9F495CC2-5325-4F18-831C-8DEFB2F89206} = {46055324-336F-4046-ADF9-1DFCA282C10F}
+		{78219FF4-C28B-4EA4-B0F9-B5467296A267} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{5374E4B3-FFA0-47E3-9400-C086E6C236CD} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{0D650281-5B86-4A2C-9D09-41BD3846B072} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{4DD667F9-B4EB-47DE-B5FF-6B30442AE921} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{7D798B08-E806-4D50-A103-4F8F0F78770D} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{9355C322-9769-418B-9B00-09EF8E96D263} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{9B6760CA-AC54-4549-9EA1-823BDF841BCA} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{4C29E3A6-45F5-4747-B471-A48EFDF88247} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{F468EC97-5E8E-46F3-87A2-D2DEE53B4605} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{791342A3-DA08-4775-8CC6-236D8769A805} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{B9E03474-32B9-4D49-BF6F-2F17DAE8D699} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{A5591BC5-7A1C-4FBA-8C38-D46D3664D713} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{76EF09ED-019E-4A1B-BFF5-509E8AA691AD} = {34884E6F-5C79-4F3C-9D96-6118E099FE6D}
+		{68210977-E10C-4BC3-B235-31B6E2AF9830} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{B5018015-F6E7-404B-99C5-980FF8298832} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{01CEF916-5FF9-4566-A507-08FD019E04F9} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{405D047F-59EB-47FA-A32D-FA4F5B97D5D6} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{263497F5-8AAC-4E15-97EC-4871E1E9606F} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{B059E91C-DA44-46BB-BD06-D208258ED8E7} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{6A80D098-69EC-45FE-A064-4CBDFA44BA43} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{FE50757B-7862-49D2-812E-1646F6FE0070} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{B1723D4C-15E3-4A39-8976-C3E1740E5F00} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{7517D0A0-5596-48B7-96EF-CB24DAD72675} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{BD19B1E7-CAFF-4009-874A-760D5A466E28} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+		{A49023C8-173A-4B8F-84B3-2FF37FE8344A} = {3D3EE813-3F89-425D-B092-7B992662C45B}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B86310E-A8A9-497B-BA92-BB9E273DC1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B86310E-A8A9-497B-BA92-BB9E273DC1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B86310E-A8A9-497B-BA92-BB9E273DC1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B86310E-A8A9-497B-BA92-BB9E273DC1CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{328889E2-78ED-4774-83FB-188BABA34FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{328889E2-78ED-4774-83FB-188BABA34FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{328889E2-78ED-4774-83FB-188BABA34FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{328889E2-78ED-4774-83FB-188BABA34FB9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14C31A82-8817-44FF-A28B-9B05797FDC4C}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5E0AF8B-CB84-4C4D-8C08-768D7057CF4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D8F8AC7-027F-4DB9-9299-4F3873310B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{9F495CC2-5325-4F18-831C-8DEFB2F89206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F495CC2-5325-4F18-831C-8DEFB2F89206}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F495CC2-5325-4F18-831C-8DEFB2F89206}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F495CC2-5325-4F18-831C-8DEFB2F89206}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{4C29E3A6-45F5-4747-B471-A48EFDF88247}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE50757B-7862-49D2-812E-1646F6FE0070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{791342A3-DA08-4775-8CC6-236D8769A805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{791342A3-DA08-4775-8CC6-236D8769A805}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{791342A3-DA08-4775-8CC6-236D8769A805}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{791342A3-DA08-4775-8CC6-236D8769A805}.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
+		{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
+		{A5591BC5-7A1C-4FBA-8C38-D46D3664D713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5591BC5-7A1C-4FBA-8C38-D46D3664D713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5591BC5-7A1C-4FBA-8C38-D46D3664D713}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5591BC5-7A1C-4FBA-8C38-D46D3664D713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76EF09ED-019E-4A1B-BFF5-509E8AA691AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76EF09ED-019E-4A1B-BFF5-509E8AA691AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76EF09ED-019E-4A1B-BFF5-509E8AA691AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76EF09ED-019E-4A1B-BFF5-509E8AA691AD}.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
+		{BD19B1E7-CAFF-4009-874A-760D5A466E28}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{39B9BECA-B7EA-426A-B1DF-91C1318AA1EB} = {DDBAD8C5-F7BE-4EB7-9B1F-AD8CAE548DB3}
-		{1B86310E-A8A9-497B-BA92-BB9E273DC1CE} = {8163E80F-4982-4BC2-A0AA-FF1284E62964}
-		{328889E2-78ED-4774-83FB-188BABA34FB9} = {EFA97506-2078-4F34-9491-9C300446FA64}
-		{14C31A82-8817-44FF-A28B-9B05797FDC4C} = {EFA97506-2078-4F34-9491-9C300446FA64}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6208DEC0-032F-495E-853B-A725B4DD1F45}
+		SolutionGuid = {2D9A0B20-A56C-4FBA-805A-DAAA97615597}
 	EndGlobalSection
 EndGlobal
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 be4f140f892a7c..70e83c27bbb15a 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
@@ -1,55 +1,226 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AF104F7B-B3E9-4EE4-84CE-4F56D9F8FCFE}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0E83BD1A-DB95-4DC8-82C0-D380761B4285}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C09E450E-9666-4062-86CE-FD85407A5DEA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{A12F26F8-8161-4E9E-B55E-53A72BDE57BB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "src\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{54B89407-FCD9-4B1A-8F83-04585D437443}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{14AACC29-CD5B-4A3D-A2FB-9EEE2D42E683}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{925D218A-9DE4-4237-814B-BE68CC0D35E9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets.Tests", "tests\Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj", "{3AEBC02F-98FB-409A-B387-C6B119A8411A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{DC24B0F6-C434-470F-9AAE-0C4CA59BF591}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "ref\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{B900DBCF-CCCC-4774-935A-356D924220D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{32B3C48F-3691-496D-AE05-6E6D20B1D0BA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj", "{08D7C8C6-53E5-42F7-9967-0F8173F56DC1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj", "{7A05EA4C-E84C-4498-AEF3-964DB25A8348}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "ref\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{E43F6FC6-A51D-473C-A942-7636CE5794DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "src\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets.Tests", "tests\Microsoft.Extensions.Configuration.UserSecrets.Tests.csproj", "{B1445194-8B98-467C-BC04-979E7D1B5942}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{26891E23-5E9D-4A36-996B-B41FEA3C0162}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{254B732C-0743-4493-80A2-BD92745A7C0C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{52E22D6B-87AB-4499-AE22-C834925456E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{F5120F23-273D-4B52-A599-BBED17A48A08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{CB0A5C33-5CDF-441D-8166-459437381CDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{EA96A79C-A11A-46ED-8123-BF0EE908EA40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{AFB63B04-4583-45CD-BA20-C7FC005AE81A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{EA38DF6E-D08D-4404-AE10-026C0856834C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{BD85452C-1434-40FF-8A2C-36BF135A22FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D3E66079-637E-4E62-8938-BFAA3D651D4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{96003091-9E9D-42D5-85A6-C2DFBD9DD847}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F100A583-97C7-4662-BCF9-DC47F2E1459E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{72BACB89-0753-4439-B845-9348E9F2FA48}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D9A8ACDF-4630-44C9-815F-25B5834F7A12}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC695A2D-AB92-4FEB-B731-0D32EF004431}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B7108E25-336B-49CD-A387-37B037B8D026}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0E83BD1A-DB95-4DC8-82C0-D380761B4285} = {D9A8ACDF-4630-44C9-815F-25B5834F7A12}
+		{B1445194-8B98-467C-BC04-979E7D1B5942} = {D9A8ACDF-4630-44C9-815F-25B5834F7A12}
+		{A12F26F8-8161-4E9E-B55E-53A72BDE57BB} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{925D218A-9DE4-4237-814B-BE68CC0D35E9} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{32B3C48F-3691-496D-AE05-6E6D20B1D0BA} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{08D7C8C6-53E5-42F7-9967-0F8173F56DC1} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{E43F6FC6-A51D-473C-A942-7636CE5794DB} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{C27ADB5F-A9DA-4D28-882C-B3C3D19156F1} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{254B732C-0743-4493-80A2-BD92745A7C0C} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{F5120F23-273D-4B52-A599-BBED17A48A08} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{EA96A79C-A11A-46ED-8123-BF0EE908EA40} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{EA38DF6E-D08D-4404-AE10-026C0856834C} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{D3E66079-637E-4E62-8938-BFAA3D651D4E} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{96003091-9E9D-42D5-85A6-C2DFBD9DD847} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{F100A583-97C7-4662-BCF9-DC47F2E1459E} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{72BACB89-0753-4439-B845-9348E9F2FA48} = {DC695A2D-AB92-4FEB-B731-0D32EF004431}
+		{54B89407-FCD9-4B1A-8F83-04585D437443} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{DC24B0F6-C434-470F-9AAE-0C4CA59BF591} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{F002EEB1-D338-451C-BB2D-A4B9BA9CD5A9} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{7A05EA4C-E84C-4498-AEF3-964DB25A8348} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{26891E23-5E9D-4A36-996B-B41FEA3C0162} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{52E22D6B-87AB-4499-AE22-C834925456E9} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{CB0A5C33-5CDF-441D-8166-459437381CDD} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{AFB63B04-4583-45CD-BA20-C7FC005AE81A} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{BD85452C-1434-40FF-8A2C-36BF135A22FE} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{1555B38A-E9CB-4734-AAB1-59CFB833A06D} = {B7108E25-336B-49CD-A387-37B037B8D026}
+		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54} = {B7108E25-336B-49CD-A387-37B037B8D026}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AEBC02F-98FB-409A-B387-C6B119A8411A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AEBC02F-98FB-409A-B387-C6B119A8411A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AEBC02F-98FB-409A-B387-C6B119A8411A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AEBC02F-98FB-409A-B387-C6B119A8411A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B900DBCF-CCCC-4774-935A-356D924220D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B900DBCF-CCCC-4774-935A-356D924220D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B900DBCF-CCCC-4774-935A-356D924220D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B900DBCF-CCCC-4774-935A-356D924220D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{E43F6FC6-A51D-473C-A942-7636CE5794DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E43F6FC6-A51D-473C-A942-7636CE5794DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E43F6FC6-A51D-473C-A942-7636CE5794DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E43F6FC6-A51D-473C-A942-7636CE5794DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B82C8CD-9F71-40D9-AF7D-F186EF57CB67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{B1445194-8B98-467C-BC04-979E7D1B5942}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1445194-8B98-467C-BC04-979E7D1B5942}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1445194-8B98-467C-BC04-979E7D1B5942}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1445194-8B98-467C-BC04-979E7D1B5942}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{EA38DF6E-D08D-4404-AE10-026C0856834C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD85452C-1434-40FF-8A2C-36BF135A22FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{D3E66079-637E-4E62-8938-BFAA3D651D4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3E66079-637E-4E62-8938-BFAA3D651D4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3E66079-637E-4E62-8938-BFAA3D651D4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3E66079-637E-4E62-8938-BFAA3D651D4E}.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
+		{1EF04395-4D84-43F1-BD99-7F6D6C3D70BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{F100A583-97C7-4662-BCF9-DC47F2E1459E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F100A583-97C7-4662-BCF9-DC47F2E1459E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F100A583-97C7-4662-BCF9-DC47F2E1459E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F100A583-97C7-4662-BCF9-DC47F2E1459E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72BACB89-0753-4439-B845-9348E9F2FA48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72BACB89-0753-4439-B845-9348E9F2FA48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72BACB89-0753-4439-B845-9348E9F2FA48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72BACB89-0753-4439-B845-9348E9F2FA48}.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
+		{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
+		{82700778-D9AD-4B9D-8A1C-CDC1A19E4D54}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F26BD9D3-D2B9-41BF-8A4C-A7DE13F66F9D} = {C09E450E-9666-4062-86CE-FD85407A5DEA}
-		{3AEBC02F-98FB-409A-B387-C6B119A8411A} = {14AACC29-CD5B-4A3D-A2FB-9EEE2D42E683}
-		{B900DBCF-CCCC-4774-935A-356D924220D3} = {AF104F7B-B3E9-4EE4-84CE-4F56D9F8FCFE}
-		{2C4CCAA8-BC71-44A6-B58B-113A6CF0A4A2} = {14AACC29-CD5B-4A3D-A2FB-9EEE2D42E683}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {907BC82F-9820-431B-B62F-3695F3B0BE65}
+		SolutionGuid = {E7F79175-49DD-42AD-833B-AE64950FE3D2}
 	EndGlobalSection
 EndGlobal
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 4faa3916b83a47..9e53feaf15e697 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
@@ -1,55 +1,261 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E2D8A805-CD9B-401A-B59D-7595D52C7F58}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8AF3BFFC-9727-4E21-8E91-11501C9F97E4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE6F53E0-F044-4384-A640-AE848CDBC57E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{B1E05D83-5479-43B7-B25C-D8243FE6B89F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "ref\Microsoft.Extensions.Configuration.Xml.csproj", "{01FFE706-A7B1-4ED5-8CE7-80F7E76BAA22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{9C73A2E3-B370-4B24-ACB0-0C3A9069250D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "src\Microsoft.Extensions.Configuration.Xml.csproj", "{E802E1BC-E55F-4604-A8B9-124E8D197D55}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B601F02A-9852-4652-B10B-EFB3919A2BC1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{21E44CA2-5355-4092-9EF7-A94520EBDD40}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml.Tests", "tests\Microsoft.Extensions.Configuration.Xml.Tests.csproj", "{607DD5BC-423D-4F97-87DE-C99A61B610C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{CA8D3F2F-410D-4E32-B104-12929767D1A8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{24086C77-1DEE-44BE-9FC2-DE00CC9BE021}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{EFC0C2A3-1F51-4299-BE43-78284F6AC670}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "ref\Microsoft.Extensions.Configuration.Xml.csproj", "{A9B02E45-3372-48F4-8761-46F916400B6E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "src\Microsoft.Extensions.Configuration.Xml.csproj", "{5CB1D123-853E-4FE7-9484-AAAD7330897C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml.Tests", "tests\Microsoft.Extensions.Configuration.Xml.Tests.csproj", "{B05F7183-70C1-4C10-9FFE-66301E0B076B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{600CBFCA-5F97-47EE-8AE9-B6262E1A764B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{03A8EBF2-F912-480F-99E1-34A9A33DD525}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{981358A2-F5ED-45CE-B037-446BB0F4E859}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{6824AD93-4154-4710-A018-81DA1FA98C40}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{4039B868-612D-420F-BC25-481660475CA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{26C61EB7-2798-4314-B750-8CD2837D4216}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1B0E1204-F3BF-4410-BAA1-256DC40EE47B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{1AE88632-F602-4B2F-A269-A7631A361FA7}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5B866430-6F0B-49F1-8294-7B07F766797A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{04F0A4D7-E743-4EFF-9FBD-604309FD075A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{A383D45E-58AC-4FC2-AB1E-0BF8666C8623}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "..\System.Security.Cryptography.Xml\ref\System.Security.Cryptography.Xml.csproj", "{A3C9F01C-6D4D-413B-BADE-A8B9046F985F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "..\System.Security.Cryptography.Xml\src\System.Security.Cryptography.Xml.csproj", "{8CBDDA63-8388-42AF-934E-7C60832A9B1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{00C86D9C-1A45-49C7-91E6-24BBBF8950CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{B25AD126-F78D-45CC-AD06-6F1E03D570DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{74732589-C551-4DEF-B56C-B489400D9951}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{D80C2723-C720-4CDF-8DCF-0338799E9121}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{00DA7CF9-86B4-4991-B760-CB3AAB31EED0}"
+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}") = "tests", "tests", "{3732BEA1-D7F7-4F49-A0F8-2317280E104A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9B998EDD-24C1-4B8E-87F3-6148ED458015}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6236136E-39F1-41AB-BB7A-0A6169D77730}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8AF3BFFC-9727-4E21-8E91-11501C9F97E4} = {3732BEA1-D7F7-4F49-A0F8-2317280E104A}
+		{B05F7183-70C1-4C10-9FFE-66301E0B076B} = {3732BEA1-D7F7-4F49-A0F8-2317280E104A}
+		{B1E05D83-5479-43B7-B25C-D8243FE6B89F} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{81370E0B-BC7E-4F49-BCF1-49E0F67F75F4} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{CA8D3F2F-410D-4E32-B104-12929767D1A8} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{A9B02E45-3372-48F4-8761-46F916400B6E} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{5BF7DAFC-8D2A-43A2-82F9-4BD0E3A62126} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{EEA5C768-9A81-4BDC-A9DD-30A2591D63FE} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{600CBFCA-5F97-47EE-8AE9-B6262E1A764B} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{981358A2-F5ED-45CE-B037-446BB0F4E859} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{4039B868-612D-420F-BC25-481660475CA8} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{1B0E1204-F3BF-4410-BAA1-256DC40EE47B} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{1AE88632-F602-4B2F-A269-A7631A361FA7} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{78F4F9EE-7E1D-41B5-B55A-850C1282EA99} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{04F0A4D7-E743-4EFF-9FBD-604309FD075A} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{00C86D9C-1A45-49C7-91E6-24BBBF8950CB} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{74732589-C551-4DEF-B56C-B489400D9951} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{00DA7CF9-86B4-4991-B760-CB3AAB31EED0} = {9B998EDD-24C1-4B8E-87F3-6148ED458015}
+		{9C73A2E3-B370-4B24-ACB0-0C3A9069250D} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{21E44CA2-5355-4092-9EF7-A94520EBDD40} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{EFC0C2A3-1F51-4299-BE43-78284F6AC670} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{5CB1D123-853E-4FE7-9484-AAAD7330897C} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{1999A9E7-2C0F-4C1D-8656-6FA5B0F32469} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{564B50A2-16A3-4AE9-ABE0-F1582F3E97C6} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{03A8EBF2-F912-480F-99E1-34A9A33DD525} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{6824AD93-4154-4710-A018-81DA1FA98C40} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{26C61EB7-2798-4314-B750-8CD2837D4216} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{5B866430-6F0B-49F1-8294-7B07F766797A} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{A383D45E-58AC-4FC2-AB1E-0BF8666C8623} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{8CBDDA63-8388-42AF-934E-7C60832A9B1C} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{B25AD126-F78D-45CC-AD06-6F1E03D570DA} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{D80C2723-C720-4CDF-8DCF-0338799E9121} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+		{C77305BE-823E-487F-825E-9C26E0674CC6} = {6236136E-39F1-41AB-BB7A-0A6169D77730}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{01FFE706-A7B1-4ED5-8CE7-80F7E76BAA22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01FFE706-A7B1-4ED5-8CE7-80F7E76BAA22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01FFE706-A7B1-4ED5-8CE7-80F7E76BAA22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01FFE706-A7B1-4ED5-8CE7-80F7E76BAA22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E802E1BC-E55F-4604-A8B9-124E8D197D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E802E1BC-E55F-4604-A8B9-124E8D197D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E802E1BC-E55F-4604-A8B9-124E8D197D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E802E1BC-E55F-4604-A8B9-124E8D197D55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{607DD5BC-423D-4F97-87DE-C99A61B610C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{607DD5BC-423D-4F97-87DE-C99A61B610C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{607DD5BC-423D-4F97-87DE-C99A61B610C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{607DD5BC-423D-4F97-87DE-C99A61B610C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24086C77-1DEE-44BE-9FC2-DE00CC9BE021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24086C77-1DEE-44BE-9FC2-DE00CC9BE021}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24086C77-1DEE-44BE-9FC2-DE00CC9BE021}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24086C77-1DEE-44BE-9FC2-DE00CC9BE021}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{A9B02E45-3372-48F4-8761-46F916400B6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9B02E45-3372-48F4-8761-46F916400B6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9B02E45-3372-48F4-8761-46F916400B6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9B02E45-3372-48F4-8761-46F916400B6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CB1D123-853E-4FE7-9484-AAAD7330897C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{B05F7183-70C1-4C10-9FFE-66301E0B076B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B05F7183-70C1-4C10-9FFE-66301E0B076B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B05F7183-70C1-4C10-9FFE-66301E0B076B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B05F7183-70C1-4C10-9FFE-66301E0B076B}.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
+		{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
+		{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
+		{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
+		{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
+		{03A8EBF2-F912-480F-99E1-34A9A33DD525}.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
+		{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
+		{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
+		{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
+		{1B0E1204-F3BF-4410-BAA1-256DC40EE47B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B0E1204-F3BF-4410-BAA1-256DC40EE47B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B0E1204-F3BF-4410-BAA1-256DC40EE47B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B0E1204-F3BF-4410-BAA1-256DC40EE47B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AE88632-F602-4B2F-A269-A7631A361FA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AE88632-F602-4B2F-A269-A7631A361FA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AE88632-F602-4B2F-A269-A7631A361FA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AE88632-F602-4B2F-A269-A7631A361FA7}.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
+		{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
+		{04F0A4D7-E743-4EFF-9FBD-604309FD075A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04F0A4D7-E743-4EFF-9FBD-604309FD075A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04F0A4D7-E743-4EFF-9FBD-604309FD075A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04F0A4D7-E743-4EFF-9FBD-604309FD075A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A383D45E-58AC-4FC2-AB1E-0BF8666C8623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A383D45E-58AC-4FC2-AB1E-0BF8666C8623}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A383D45E-58AC-4FC2-AB1E-0BF8666C8623}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A383D45E-58AC-4FC2-AB1E-0BF8666C8623}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3C9F01C-6D4D-413B-BADE-A8B9046F985F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{74732589-C551-4DEF-B56C-B489400D9951}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74732589-C551-4DEF-B56C-B489400D9951}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74732589-C551-4DEF-B56C-B489400D9951}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74732589-C551-4DEF-B56C-B489400D9951}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D80C2723-C720-4CDF-8DCF-0338799E9121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D80C2723-C720-4CDF-8DCF-0338799E9121}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D80C2723-C720-4CDF-8DCF-0338799E9121}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D80C2723-C720-4CDF-8DCF-0338799E9121}.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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{01FFE706-A7B1-4ED5-8CE7-80F7E76BAA22} = {E2D8A805-CD9B-401A-B59D-7595D52C7F58}
-		{E802E1BC-E55F-4604-A8B9-124E8D197D55} = {EE6F53E0-F044-4384-A640-AE848CDBC57E}
-		{607DD5BC-423D-4F97-87DE-C99A61B610C9} = {B601F02A-9852-4652-B10B-EFB3919A2BC1}
-		{24086C77-1DEE-44BE-9FC2-DE00CC9BE021} = {B601F02A-9852-4652-B10B-EFB3919A2BC1}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {52BB33A4-0192-4938-AFEF-8712C028449E}
+		SolutionGuid = {830494DE-07B3-4C63-9D74-4A123677D469}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
index 8f9477764eff3d..81e3ccdd6b8e3a 100644
--- a/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
+++ b/src/libraries/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.sln
@@ -1,65 +1,366 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C5F14D7C-F4F1-4428-9067-B13C831DF521}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6B148547-AC7D-45DC-A059-064D72A6E501}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{928FE2B9-8D33-49F6-BEE1-70E7C641B476}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{32CE4366-07A8-4874-9A12-46D5430A2203}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4ADA9C07-0B5F-4D6C-BC93-C4072C9C3FF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{CDC60461-56B7-4941-AD08-90228BD450CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "ref\Microsoft.Extensions.Configuration.csproj", "{C5DB9130-1A0B-4817-83EF-92230089D29A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{8C395040-9876-47BE-A2EE-4485A6815F89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration.csproj", "{0B090AAC-BD29-4348-8805-5D025453B3AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FunctionalTests", "FunctionalTests", "{D2F146C5-E638-46CC-9BEC-200427ED75EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{D4008AFA-F81B-4879-A059-438355A77754}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Functional.Tests", "tests\FunctionalTests\Microsoft.Extensions.Configuration.Functional.Tests.csproj", "{6B9E1F2C-EA59-4E80-9876-C86139A5229F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Tests", "tests\Microsoft.Extensions.Configuration.Tests.csproj", "{5FE6F8FC-B97B-49D2-824C-FFDA1D4546E6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "..\Microsoft.Extensions.Configuration.CommandLine\ref\Microsoft.Extensions.Configuration.CommandLine.csproj", "{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{36C9E152-A874-4A9C-8AF8-96F58C7630FD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "..\Microsoft.Extensions.Configuration.CommandLine\src\Microsoft.Extensions.Configuration.CommandLine.csproj", "{6242406A-B80A-43EA-A589-F3C665F23662}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "..\Microsoft.Extensions.Configuration.EnvironmentVariables\ref\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{8F29D582-1B4F-4213-B268-CDC3A8945D38}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "..\Microsoft.Extensions.Configuration.EnvironmentVariables\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{ACFDD440-9823-4590-98FA-5C3E0832330D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{C3335B42-0CBE-4351-8365-50013C7E8596}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{EC87683C-72A1-47BA-B1FE-CBA0D7664896}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "..\Microsoft.Extensions.Configuration.Ini\ref\Microsoft.Extensions.Configuration.Ini.csproj", "{F1389CD4-AA69-4BEB-A1B8-FC609931D780}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "..\Microsoft.Extensions.Configuration.Ini\src\Microsoft.Extensions.Configuration.Ini.csproj", "{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj", "{592CD515-9398-47AA-987A-99278C4253EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj", "{2CC46F81-A2A5-4B5D-93A9-0596F33D4301}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "..\Microsoft.Extensions.Configuration.UserSecrets\ref\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{E5C36621-D034-46F9-B8FE-14007EAEEF55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "..\Microsoft.Extensions.Configuration.UserSecrets\src\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{8F234107-D9B1-4678-A5FA-FDBBDC85204A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "..\Microsoft.Extensions.Configuration.Xml\ref\Microsoft.Extensions.Configuration.Xml.csproj", "{17930AA2-597B-4BB3-8156-720AFB469720}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "..\Microsoft.Extensions.Configuration.Xml\src\Microsoft.Extensions.Configuration.Xml.csproj", "{3468613D-25D9-43DE-9A43-42E4E070E6F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "ref\Microsoft.Extensions.Configuration.csproj", "{F40120E8-831C-4BC8-B012-997464CEA782}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration.csproj", "{67E83D85-6D5D-446E-90D7-9A8DCB7959D1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Functional.Tests", "tests\FunctionalTests\Microsoft.Extensions.Configuration.Functional.Tests.csproj", "{E971240B-FAB5-4C6D-8742-3E22C17913EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Tests", "tests\Microsoft.Extensions.Configuration.Tests.csproj", "{A786592E-9550-4091-9697-FDCD6FFFDA88}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{5B95C1F6-D554-4E4A-8DD1-744662F41987}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{53E4909F-FC0B-4727-A73D-686C5115E8C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{42C10152-F747-443F-9AC1-5738CB62EA6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{F4B7B95E-F732-474A-BED7-782AD2F4A1A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{8F65DFBB-9196-4E69-879A-C99C641B3E49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{EC8DB110-890E-4388-97FC-0E25D98BC6F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{165EBE5E-E512-4E7E-8C2D-1F4297483D3E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0E133FD2-E1E7-4FF7-A498-C787A48E1B8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{75A03875-DC97-42AE-9EFE-78DC736B8BD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F128A6B5-C1B3-452C-A66B-0138E895B1E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{30CE3F5F-5BF3-4801-B518-CED10B9E8B5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "..\System.Security.Cryptography.Xml\ref\System.Security.Cryptography.Xml.csproj", "{F74DB3B7-243F-447D-AE39-672348F661A1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "..\System.Security.Cryptography.Xml\src\System.Security.Cryptography.Xml.csproj", "{BAA953EF-6529-4F2C-8F89-C76A05258677}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{E2181F3B-BDC4-4373-9DA8-F3B50159C65E}"
+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.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{5307B272-8693-40A9-9AFE-E82AC7EFECC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{A2E0A4AC-91AA-4F94-81B6-31146BB40F25}"
+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", "..\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}") = "tests", "tests", "{EA311EEF-3495-4D07-93F3-15A69C8CCEFB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9291622A-D376-4926-8DD8-3C3A11979FF5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0615D217-A0F8-4114-8769-050E7C040B60}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{6B148547-AC7D-45DC-A059-064D72A6E501} = {EA311EEF-3495-4D07-93F3-15A69C8CCEFB}
+		{E971240B-FAB5-4C6D-8742-3E22C17913EA} = {EA311EEF-3495-4D07-93F3-15A69C8CCEFB}
+		{A786592E-9550-4091-9697-FDCD6FFFDA88} = {EA311EEF-3495-4D07-93F3-15A69C8CCEFB}
+		{32CE4366-07A8-4874-9A12-46D5430A2203} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{8C395040-9876-47BE-A2EE-4485A6815F89} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{D4008AFA-F81B-4879-A059-438355A77754} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{EB9E0AFD-4B8E-495F-A23E-1C51F9A57E95} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{8F29D582-1B4F-4213-B268-CDC3A8945D38} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{C3335B42-0CBE-4351-8365-50013C7E8596} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{F1389CD4-AA69-4BEB-A1B8-FC609931D780} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{592CD515-9398-47AA-987A-99278C4253EC} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{E5C36621-D034-46F9-B8FE-14007EAEEF55} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{17930AA2-597B-4BB3-8156-720AFB469720} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{F40120E8-831C-4BC8-B012-997464CEA782} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{5B95C1F6-D554-4E4A-8DD1-744662F41987} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{53E4909F-FC0B-4727-A73D-686C5115E8C9} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{F4B7B95E-F732-474A-BED7-782AD2F4A1A4} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{EC8DB110-890E-4388-97FC-0E25D98BC6F4} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{0E133FD2-E1E7-4FF7-A498-C787A48E1B8D} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{5D0D6749-312A-4400-89D8-A7252D9A879B} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{F128A6B5-C1B3-452C-A66B-0138E895B1E6} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{F74DB3B7-243F-447D-AE39-672348F661A1} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{E2181F3B-BDC4-4373-9DA8-F3B50159C65E} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{5307B272-8693-40A9-9AFE-E82AC7EFECC6} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{6CDFD705-28EC-4D58-A2F9-715A3B06661B} = {9291622A-D376-4926-8DD8-3C3A11979FF5}
+		{CDC60461-56B7-4941-AD08-90228BD450CE} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{9AF25AFA-6E25-4CA1-AD4F-FF77FD771714} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{71F50A26-C4A8-4142-B0FD-E5D9EFEF34A1} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{6242406A-B80A-43EA-A589-F3C665F23662} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{ACFDD440-9823-4590-98FA-5C3E0832330D} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{EC87683C-72A1-47BA-B1FE-CBA0D7664896} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{E62E55D1-C18C-43BF-8E61-1AFADC46E7E2} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{2CC46F81-A2A5-4B5D-93A9-0596F33D4301} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{8F234107-D9B1-4678-A5FA-FDBBDC85204A} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{3468613D-25D9-43DE-9A43-42E4E070E6F6} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{42C10152-F747-443F-9AC1-5738CB62EA6C} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{8F65DFBB-9196-4E69-879A-C99C641B3E49} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{75A03875-DC97-42AE-9EFE-78DC736B8BD6} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{30CE3F5F-5BF3-4801-B518-CED10B9E8B5B} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{BAA953EF-6529-4F2C-8F89-C76A05258677} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{6CCBE9AB-E620-4616-9B80-1F9D3E722B87} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{A2E0A4AC-91AA-4F94-81B6-31146BB40F25} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{23F4102D-67BD-4865-BB19-195C47945733} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{41234DB5-1F3A-4E4A-8BD9-4A277C249666} = {0615D217-A0F8-4114-8769-050E7C040B60}
+		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0} = {0615D217-A0F8-4114-8769-050E7C040B60}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C5DB9130-1A0B-4817-83EF-92230089D29A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5DB9130-1A0B-4817-83EF-92230089D29A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5DB9130-1A0B-4817-83EF-92230089D29A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5DB9130-1A0B-4817-83EF-92230089D29A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B090AAC-BD29-4348-8805-5D025453B3AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B090AAC-BD29-4348-8805-5D025453B3AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B090AAC-BD29-4348-8805-5D025453B3AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B090AAC-BD29-4348-8805-5D025453B3AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B9E1F2C-EA59-4E80-9876-C86139A5229F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B9E1F2C-EA59-4E80-9876-C86139A5229F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B9E1F2C-EA59-4E80-9876-C86139A5229F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B9E1F2C-EA59-4E80-9876-C86139A5229F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FE6F8FC-B97B-49D2-824C-FFDA1D4546E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FE6F8FC-B97B-49D2-824C-FFDA1D4546E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FE6F8FC-B97B-49D2-824C-FFDA1D4546E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5FE6F8FC-B97B-49D2-824C-FFDA1D4546E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36C9E152-A874-4A9C-8AF8-96F58C7630FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36C9E152-A874-4A9C-8AF8-96F58C7630FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36C9E152-A874-4A9C-8AF8-96F58C7630FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36C9E152-A874-4A9C-8AF8-96F58C7630FD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B148547-AC7D-45DC-A059-064D72A6E501}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B148547-AC7D-45DC-A059-064D72A6E501}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B148547-AC7D-45DC-A059-064D72A6E501}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B148547-AC7D-45DC-A059-064D72A6E501}.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
+		{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
+		{8C395040-9876-47BE-A2EE-4485A6815F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C395040-9876-47BE-A2EE-4485A6815F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C395040-9876-47BE-A2EE-4485A6815F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C395040-9876-47BE-A2EE-4485A6815F89}.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
+		{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
+		{D4008AFA-F81B-4879-A059-438355A77754}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{592CD515-9398-47AA-987A-99278C4253EC}.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
+		{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
+		{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
+		{8F234107-D9B1-4678-A5FA-FDBBDC85204A}.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
+		{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
+		{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
+		{67E83D85-6D5D-446E-90D7-9A8DCB7959D1}.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
+		{5B95C1F6-D554-4E4A-8DD1-744662F41987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{9B33CC5B-8010-4D4E-B39D-B6805A16C7E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{EC8DB110-890E-4388-97FC-0E25D98BC6F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC8DB110-890E-4388-97FC-0E25D98BC6F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC8DB110-890E-4388-97FC-0E25D98BC6F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC8DB110-890E-4388-97FC-0E25D98BC6F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{165EBE5E-E512-4E7E-8C2D-1F4297483D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{0E133FD2-E1E7-4FF7-A498-C787A48E1B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E133FD2-E1E7-4FF7-A498-C787A48E1B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E133FD2-E1E7-4FF7-A498-C787A48E1B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E133FD2-E1E7-4FF7-A498-C787A48E1B8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C53F8E4E-442C-48BF-9B6F-3E7381C0FD74}.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
+		{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
+		{F128A6B5-C1B3-452C-A66B-0138E895B1E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F128A6B5-C1B3-452C-A66B-0138E895B1E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F128A6B5-C1B3-452C-A66B-0138E895B1E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F128A6B5-C1B3-452C-A66B-0138E895B1E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30CE3F5F-5BF3-4801-B518-CED10B9E8B5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30CE3F5F-5BF3-4801-B518-CED10B9E8B5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30CE3F5F-5BF3-4801-B518-CED10B9E8B5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30CE3F5F-5BF3-4801-B518-CED10B9E8B5B}.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
+		{F74DB3B7-243F-447D-AE39-672348F661A1}.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
+		{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
+		{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
+		{5307B272-8693-40A9-9AFE-E82AC7EFECC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5307B272-8693-40A9-9AFE-E82AC7EFECC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5307B272-8693-40A9-9AFE-E82AC7EFECC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5307B272-8693-40A9-9AFE-E82AC7EFECC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2E0A4AC-91AA-4F94-81B6-31146BB40F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2E0A4AC-91AA-4F94-81B6-31146BB40F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2E0A4AC-91AA-4F94-81B6-31146BB40F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2E0A4AC-91AA-4F94-81B6-31146BB40F25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23F4102D-67BD-4865-BB19-195C47945733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{41234DB5-1F3A-4E4A-8BD9-4A277C249666}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{6CDFD705-28EC-4D58-A2F9-715A3B06661B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CFEB13D-63D5-42A7-868C-CE1D0049EAF0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C5DB9130-1A0B-4817-83EF-92230089D29A} = {C5F14D7C-F4F1-4428-9067-B13C831DF521}
-		{0B090AAC-BD29-4348-8805-5D025453B3AD} = {928FE2B9-8D33-49F6-BEE1-70E7C641B476}
-		{D2F146C5-E638-46CC-9BEC-200427ED75EB} = {4ADA9C07-0B5F-4D6C-BC93-C4072C9C3FF5}
-		{6B9E1F2C-EA59-4E80-9876-C86139A5229F} = {D2F146C5-E638-46CC-9BEC-200427ED75EB}
-		{5FE6F8FC-B97B-49D2-824C-FFDA1D4546E6} = {4ADA9C07-0B5F-4D6C-BC93-C4072C9C3FF5}
-		{36C9E152-A874-4A9C-8AF8-96F58C7630FD} = {4ADA9C07-0B5F-4D6C-BC93-C4072C9C3FF5}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C5AF08F4-34A5-42B8-A7BD-A03DA5D0C7BC}
+		SolutionGuid = {81EEF2A5-6387-4CC4-B7CD-908EEA4E5C79}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln
index 68c25466c8af14..56ba13c4f74a83 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/Microsoft.Extensions.DependencyInjection.Abstractions.sln
@@ -1,39 +1,35 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7F380E4E-6BB4-4129-87F2-6D64023BEDCB}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{B8B63EFF-64D9-49AB-ACE9-6182DADC7574}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BDDF294D-5DFD-431D-9C1D-081958287CB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{E3F4D946-70AF-4CCB-86A5-65237DB78D9C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C4483ADE-FDF5-414E-AD3F-07CBA3E49796}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{70BFBB37-F99C-42FB-BD53-D0E024183B82}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4CA6208B-2009-4B31-B500-641F85F0AA5E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B8B63EFF-64D9-49AB-ACE9-6182DADC7574} = {C4483ADE-FDF5-414E-AD3F-07CBA3E49796}
+		{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF} = {4CA6208B-2009-4B31-B500-641F85F0AA5E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E3F4D946-70AF-4CCB-86A5-65237DB78D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3F4D946-70AF-4CCB-86A5-65237DB78D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3F4D946-70AF-4CCB-86A5-65237DB78D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3F4D946-70AF-4CCB-86A5-65237DB78D9C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70BFBB37-F99C-42FB-BD53-D0E024183B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70BFBB37-F99C-42FB-BD53-D0E024183B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70BFBB37-F99C-42FB-BD53-D0E024183B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70BFBB37-F99C-42FB-BD53-D0E024183B82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8B63EFF-64D9-49AB-ACE9-6182DADC7574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8B63EFF-64D9-49AB-ACE9-6182DADC7574}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8B63EFF-64D9-49AB-ACE9-6182DADC7574}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8B63EFF-64D9-49AB-ACE9-6182DADC7574}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1AEAA98-0D46-4E23-8644-6BD5EBCE32AF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E3F4D946-70AF-4CCB-86A5-65237DB78D9C} = {7F380E4E-6BB4-4129-87F2-6D64023BEDCB}
-		{70BFBB37-F99C-42FB-BD53-D0E024183B82} = {BDDF294D-5DFD-431D-9C1D-081958287CB6}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {31580E98-9F5C-4AE2-B29A-639789B7135C}
+		SolutionGuid = {BD3A79CE-CF84-4543-99E4-D39D56E8DAEF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
index b7273ab06c8c88..2a399d5f81104d 100644
--- a/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyInjection/Microsoft.Extensions.DependencyInjection.sln
@@ -1,62 +1,121 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BF719C68-E106-47F7-AD0D-F996739BA266}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{30201F60-A891-4C3F-A1A6-DDDD1C8525E3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{91EEAE13-DEB6-435F-B80B-83102F3A7F33}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{047FD3F2-B3A0-4639-B4F0-40D29E61725D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{615C17D7-1F66-4409-A982-73C31C517388}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{3068B34E-D975-4C11-B2F2-F10790051F2E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "ref\Microsoft.Extensions.DependencyInjection.csproj", "{D4F906D8-961A-41CA-A859-A336F3CB9DD3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{6D90C067-5CCD-4443-81A5-B9C385011F68}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "src\Microsoft.Extensions.DependencyInjection.csproj", "{0BD0C911-A456-40DA-B5B7-D51887777BF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{9CD9F9EB-379C-44C1-9016-33DFEC821C76}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Tests", "tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj", "{85D59394-C2FA-42D0-B04A-B1F8E244E619}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "ref\Microsoft.Extensions.DependencyInjection.csproj", "{66E6ADF5-200F-41F3-9CA4-858EF69D2A61}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{62FF9AD2-6603-4F9C-AB56-FCACEE3B6723}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "src\Microsoft.Extensions.DependencyInjection.csproj", "{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests", "tests\DI.External.Tests\Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj", "{01D2CC74-63FC-4091-B278-8BD264C325E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests", "tests\DI.External.Tests\Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj", "{F11DD75C-122C-4B98-9EED-F71551F9562A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Tests", "tests\DI.Tests\Microsoft.Extensions.DependencyInjection.Tests.csproj", "{1EE6CA66-6585-459D-8889-666D4C2D4C27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FE84DBDF-2275-4B14-8B08-A59A64E573BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{77D74FC2-FCB5-474B-AB77-2BD0354CEB29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BA9F4FC9-6312-4E3D-BC54-300444064F6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B7FC8A33-9FB0-4E58-B3EC-06F4B95BF6D2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C720B37D-E4D9-4B8C-B993-71F5C9C5A381}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F109FFD1-2A08-4114-9FC5-A119229B4983}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{30201F60-A891-4C3F-A1A6-DDDD1C8525E3} = {C720B37D-E4D9-4B8C-B993-71F5C9C5A381}
+		{F11DD75C-122C-4B98-9EED-F71551F9562A} = {C720B37D-E4D9-4B8C-B993-71F5C9C5A381}
+		{1EE6CA66-6585-459D-8889-666D4C2D4C27} = {C720B37D-E4D9-4B8C-B993-71F5C9C5A381}
+		{047FD3F2-B3A0-4639-B4F0-40D29E61725D} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{6D90C067-5CCD-4443-81A5-B9C385011F68} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{66E6ADF5-200F-41F3-9CA4-858EF69D2A61} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{FE84DBDF-2275-4B14-8B08-A59A64E573BA} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{BA9F4FC9-6312-4E3D-BC54-300444064F6A} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{B7FC8A33-9FB0-4E58-B3EC-06F4B95BF6D2} = {3C9BFC55-DE9A-42C0-A843-2F7D703EEB7D}
+		{3068B34E-D975-4C11-B2F2-F10790051F2E} = {F109FFD1-2A08-4114-9FC5-A119229B4983}
+		{9CD9F9EB-379C-44C1-9016-33DFEC821C76} = {F109FFD1-2A08-4114-9FC5-A119229B4983}
+		{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A} = {F109FFD1-2A08-4114-9FC5-A119229B4983}
+		{77D74FC2-FCB5-474B-AB77-2BD0354CEB29} = {F109FFD1-2A08-4114-9FC5-A119229B4983}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4F906D8-961A-41CA-A859-A336F3CB9DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4F906D8-961A-41CA-A859-A336F3CB9DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4F906D8-961A-41CA-A859-A336F3CB9DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4F906D8-961A-41CA-A859-A336F3CB9DD3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BD0C911-A456-40DA-B5B7-D51887777BF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BD0C911-A456-40DA-B5B7-D51887777BF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BD0C911-A456-40DA-B5B7-D51887777BF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BD0C911-A456-40DA-B5B7-D51887777BF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85D59394-C2FA-42D0-B04A-B1F8E244E619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85D59394-C2FA-42D0-B04A-B1F8E244E619}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85D59394-C2FA-42D0-B04A-B1F8E244E619}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85D59394-C2FA-42D0-B04A-B1F8E244E619}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62FF9AD2-6603-4F9C-AB56-FCACEE3B6723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62FF9AD2-6603-4F9C-AB56-FCACEE3B6723}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62FF9AD2-6603-4F9C-AB56-FCACEE3B6723}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62FF9AD2-6603-4F9C-AB56-FCACEE3B6723}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01D2CC74-63FC-4091-B278-8BD264C325E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01D2CC74-63FC-4091-B278-8BD264C325E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01D2CC74-63FC-4091-B278-8BD264C325E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01D2CC74-63FC-4091-B278-8BD264C325E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30201F60-A891-4C3F-A1A6-DDDD1C8525E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{047FD3F2-B3A0-4639-B4F0-40D29E61725D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3068B34E-D975-4C11-B2F2-F10790051F2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3068B34E-D975-4C11-B2F2-F10790051F2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3068B34E-D975-4C11-B2F2-F10790051F2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3068B34E-D975-4C11-B2F2-F10790051F2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D90C067-5CCD-4443-81A5-B9C385011F68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D90C067-5CCD-4443-81A5-B9C385011F68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D90C067-5CCD-4443-81A5-B9C385011F68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D90C067-5CCD-4443-81A5-B9C385011F68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CD9F9EB-379C-44C1-9016-33DFEC821C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CD9F9EB-379C-44C1-9016-33DFEC821C76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CD9F9EB-379C-44C1-9016-33DFEC821C76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CD9F9EB-379C-44C1-9016-33DFEC821C76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66E6ADF5-200F-41F3-9CA4-858EF69D2A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66E6ADF5-200F-41F3-9CA4-858EF69D2A61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66E6ADF5-200F-41F3-9CA4-858EF69D2A61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66E6ADF5-200F-41F3-9CA4-858EF69D2A61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5ECD02C-FA5A-4B56-9CA2-47AD8989714A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F11DD75C-122C-4B98-9EED-F71551F9562A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F11DD75C-122C-4B98-9EED-F71551F9562A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F11DD75C-122C-4B98-9EED-F71551F9562A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F11DD75C-122C-4B98-9EED-F71551F9562A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EE6CA66-6585-459D-8889-666D4C2D4C27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE84DBDF-2275-4B14-8B08-A59A64E573BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE84DBDF-2275-4B14-8B08-A59A64E573BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE84DBDF-2275-4B14-8B08-A59A64E573BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE84DBDF-2275-4B14-8B08-A59A64E573BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AA95B73-BE27-4E8C-AD7C-2E0F62B4E6BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77D74FC2-FCB5-474B-AB77-2BD0354CEB29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77D74FC2-FCB5-474B-AB77-2BD0354CEB29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77D74FC2-FCB5-474B-AB77-2BD0354CEB29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77D74FC2-FCB5-474B-AB77-2BD0354CEB29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA9F4FC9-6312-4E3D-BC54-300444064F6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA9F4FC9-6312-4E3D-BC54-300444064F6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA9F4FC9-6312-4E3D-BC54-300444064F6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA9F4FC9-6312-4E3D-BC54-300444064F6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7FC8A33-9FB0-4E58-B3EC-06F4B95BF6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7FC8A33-9FB0-4E58-B3EC-06F4B95BF6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7FC8A33-9FB0-4E58-B3EC-06F4B95BF6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7FC8A33-9FB0-4E58-B3EC-06F4B95BF6D2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D4F906D8-961A-41CA-A859-A336F3CB9DD3} = {91EEAE13-DEB6-435F-B80B-83102F3A7F33}
-		{0BD0C911-A456-40DA-B5B7-D51887777BF9} = {BF719C68-E106-47F7-AD0D-F996739BA266}
-		{85D59394-C2FA-42D0-B04A-B1F8E244E619} = {615C17D7-1F66-4409-A982-73C31C517388}
-		{62FF9AD2-6603-4F9C-AB56-FCACEE3B6723} = {615C17D7-1F66-4409-A982-73C31C517388}
-		{01D2CC74-63FC-4091-B278-8BD264C325E3} = {615C17D7-1F66-4409-A982-73C31C517388}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {91C254CC-F9EE-4916-8A19-F816C708AE3C}
+		SolutionGuid = {68A7BDA7-8093-433C-BF7A-8A6A7560BD02}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
index 64a261669117b7..629260433791db 100644
--- a/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
+++ b/src/libraries/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.sln
@@ -1,96 +1,121 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29920.165
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel.csproj", "{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E5B6A94F-615E-4DAF-8110-E5A776BB8296}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel", "ref\Microsoft.Extensions.DependencyModel.csproj", "{9EACDD3F-3833-4E71-954A-847989D634AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{696D69C9-C5F6-405E-A8B5-5375D08BBADC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel.Tests", "tests\Microsoft.Extensions.DependencyModel.Tests.csproj", "{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{2AED2951-7724-4EFC-8E16-6DF877C6B4A6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{48E09E46-BD12-4B7E-9D10-3FEC7F9AE9B4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel", "ref\Microsoft.Extensions.DependencyModel.csproj", "{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47B5CCF6-E349-42D1-B3C2-900EFF594C8A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel.csproj", "{5C580568-6072-4F27-B5C6-FA04556E3B98}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A05AC200-A15B-430E-A4BD-522C570DDCB3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyModel.Tests", "tests\Microsoft.Extensions.DependencyModel.Tests.csproj", "{F5E89C81-2D78-4F86-ABD2-7D983F46EB58}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{8C081484-2645-46B8-B33E-DC3D883B27F1}"
-	ProjectSection(SolutionItems) = preProject
-		pkg\Microsoft.Extensions.DependencyModel.pkgproj = pkg\Microsoft.Extensions.DependencyModel.pkgproj
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nonentrypointassembly", "tests\nonentrypointassembly\nonentrypointassembly.csproj", "{5351C410-530D-4724-A8E6-430831E7332B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4FF50F50-C230-4C48-9DB1-080441BF7349}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B9B2CCC3-6F39-4EA9-9566-165413A7E0CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F38E2965-8DBB-4795-89AF-C0109EB23574}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{42A46E81-16D3-463A-8DD9-EDA284246142}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{3D6318B9-0324-4C10-9033-9C938C2DECCC}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{FA7201FE-097D-4197-BDEC-329986814D8D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6CDD0F3A-28C1-487C-958D-284E94B14D7F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7443F4C1-08AA-4C3C-9543-DB736B27D1E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6FBA8695-5140-46A6-BFD1-236C6588B6CC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E5B6A94F-615E-4DAF-8110-E5A776BB8296} = {6CDD0F3A-28C1-487C-958D-284E94B14D7F}
+		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58} = {6CDD0F3A-28C1-487C-958D-284E94B14D7F}
+		{5351C410-530D-4724-A8E6-430831E7332B} = {6CDD0F3A-28C1-487C-958D-284E94B14D7F}
+		{696D69C9-C5F6-405E-A8B5-5375D08BBADC} = {7443F4C1-08AA-4C3C-9543-DB736B27D1E2}
+		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6} = {7443F4C1-08AA-4C3C-9543-DB736B27D1E2}
+		{B9B2CCC3-6F39-4EA9-9566-165413A7E0CC} = {7443F4C1-08AA-4C3C-9543-DB736B27D1E2}
+		{F38E2965-8DBB-4795-89AF-C0109EB23574} = {7443F4C1-08AA-4C3C-9543-DB736B27D1E2}
+		{42A46E81-16D3-463A-8DD9-EDA284246142} = {7443F4C1-08AA-4C3C-9543-DB736B27D1E2}
+		{3D6318B9-0324-4C10-9033-9C938C2DECCC} = {7443F4C1-08AA-4C3C-9543-DB736B27D1E2}
+		{2AED2951-7724-4EFC-8E16-6DF877C6B4A6} = {6FBA8695-5140-46A6-BFD1-236C6588B6CC}
+		{5C580568-6072-4F27-B5C6-FA04556E3B98} = {6FBA8695-5140-46A6-BFD1-236C6588B6CC}
+		{4A28B457-D950-486B-B59B-A4C977A733B1} = {6FBA8695-5140-46A6-BFD1-236C6588B6CC}
+		{7902A0CA-E94D-4C96-A112-455A1E5E2390} = {6FBA8695-5140-46A6-BFD1-236C6588B6CC}
+		{FA7201FE-097D-4197-BDEC-329986814D8D} = {6FBA8695-5140-46A6-BFD1-236C6588B6CC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Debug|x64.Build.0 = Debug|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Debug|x86.Build.0 = Debug|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Release|x64.ActiveCfg = Release|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Release|x64.Build.0 = Release|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Release|x86.ActiveCfg = Release|Any CPU
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1}.Release|x86.Build.0 = Release|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Debug|x64.Build.0 = Debug|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Debug|x86.Build.0 = Debug|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Release|x64.ActiveCfg = Release|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Release|x64.Build.0 = Release|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Release|x86.ActiveCfg = Release|Any CPU
-		{9EACDD3F-3833-4E71-954A-847989D634AB}.Release|x86.Build.0 = Release|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Debug|x86.Build.0 = Debug|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Release|x64.ActiveCfg = Release|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Release|x64.Build.0 = Release|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Release|x86.ActiveCfg = Release|Any CPU
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C}.Release|x86.Build.0 = Release|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Debug|x64.Build.0 = Debug|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Debug|x86.Build.0 = Debug|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Release|x64.ActiveCfg = Release|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Release|x64.Build.0 = Release|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Release|x86.ActiveCfg = Release|Any CPU
-		{4FF50F50-C230-4C48-9DB1-080441BF7349}.Release|x86.Build.0 = Release|Any CPU
+		{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5B6A94F-615E-4DAF-8110-E5A776BB8296}.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
+		{696D69C9-C5F6-405E-A8B5-5375D08BBADC}.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
+		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D9C22DB-C4E3-483E-AF78-C1DCE6ED8DD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C580568-6072-4F27-B5C6-FA04556E3B98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C580568-6072-4F27-B5C6-FA04556E3B98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C580568-6072-4F27-B5C6-FA04556E3B98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C580568-6072-4F27-B5C6-FA04556E3B98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5E89C81-2D78-4F86-ABD2-7D983F46EB58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5351C410-530D-4724-A8E6-430831E7332B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5351C410-530D-4724-A8E6-430831E7332B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5351C410-530D-4724-A8E6-430831E7332B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5351C410-530D-4724-A8E6-430831E7332B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9B2CCC3-6F39-4EA9-9566-165413A7E0CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9B2CCC3-6F39-4EA9-9566-165413A7E0CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9B2CCC3-6F39-4EA9-9566-165413A7E0CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9B2CCC3-6F39-4EA9-9566-165413A7E0CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F38E2965-8DBB-4795-89AF-C0109EB23574}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{4A28B457-D950-486B-B59B-A4C977A733B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{42A46E81-16D3-463A-8DD9-EDA284246142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42A46E81-16D3-463A-8DD9-EDA284246142}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42A46E81-16D3-463A-8DD9-EDA284246142}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42A46E81-16D3-463A-8DD9-EDA284246142}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D6318B9-0324-4C10-9033-9C938C2DECCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D6318B9-0324-4C10-9033-9C938C2DECCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D6318B9-0324-4C10-9033-9C938C2DECCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D6318B9-0324-4C10-9033-9C938C2DECCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7902A0CA-E94D-4C96-A112-455A1E5E2390}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA7201FE-097D-4197-BDEC-329986814D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA7201FE-097D-4197-BDEC-329986814D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA7201FE-097D-4197-BDEC-329986814D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA7201FE-097D-4197-BDEC-329986814D8D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5E0AA1BE-28A2-4D25-A10A-E13EBDABE8A1} = {47B5CCF6-E349-42D1-B3C2-900EFF594C8A}
-		{9EACDD3F-3833-4E71-954A-847989D634AB} = {48E09E46-BD12-4B7E-9D10-3FEC7F9AE9B4}
-		{E0DEC773-1FE9-49B0-9562-1E245FE2DA5C} = {A05AC200-A15B-430E-A4BD-522C570DDCB3}
-		{4FF50F50-C230-4C48-9DB1-080441BF7349} = {A05AC200-A15B-430E-A4BD-522C570DDCB3}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {56AA6766-64A9-4715-BC6B-4A24EF6AF7F9}
+		SolutionGuid = {810D114A-26F4-4151-9EFE-29A7F1BF62AA}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln
index 5269452955f275..bf7c46021aeaed 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Abstractions/Microsoft.Extensions.FileProviders.Abstractions.sln
@@ -1,39 +1,63 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5A85C3DC-D0CF-4A03-9071-0C6C29B63856}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{D2B5E003-2790-43C3-93BD-923E874A4B85}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F39ECBD1-A0AC-4195-BCA9-2B8789853CDE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{DD99D42D-60FD-45D8-9F55-BE3AE38626D0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{494E2DDD-4224-49E0-A747-26F948EBACFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{F985DC40-F983-4464-B866-3BD17EE3B6B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{E9266982-7205-46C8-B457-CCF450959793}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{28E2BB23-2533-4909-8DA6-911AC3D7224B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{39D21DF7-2E75-44F1-9A58-B07DC2580700}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D2B5E003-2790-43C3-93BD-923E874A4B85} = {28E2BB23-2533-4909-8DA6-911AC3D7224B}
+		{F985DC40-F983-4464-B866-3BD17EE3B6B1} = {28E2BB23-2533-4909-8DA6-911AC3D7224B}
+		{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A} = {28E2BB23-2533-4909-8DA6-911AC3D7224B}
+		{DD99D42D-60FD-45D8-9F55-BE3AE38626D0} = {39D21DF7-2E75-44F1-9A58-B07DC2580700}
+		{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE} = {39D21DF7-2E75-44F1-9A58-B07DC2580700}
+		{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B} = {39D21DF7-2E75-44F1-9A58-B07DC2580700}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{494E2DDD-4224-49E0-A747-26F948EBACFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{494E2DDD-4224-49E0-A747-26F948EBACFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{494E2DDD-4224-49E0-A747-26F948EBACFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{494E2DDD-4224-49E0-A747-26F948EBACFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9266982-7205-46C8-B457-CCF450959793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9266982-7205-46C8-B457-CCF450959793}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9266982-7205-46C8-B457-CCF450959793}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9266982-7205-46C8-B457-CCF450959793}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2B5E003-2790-43C3-93BD-923E874A4B85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2B5E003-2790-43C3-93BD-923E874A4B85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2B5E003-2790-43C3-93BD-923E874A4B85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2B5E003-2790-43C3-93BD-923E874A4B85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD99D42D-60FD-45D8-9F55-BE3AE38626D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD99D42D-60FD-45D8-9F55-BE3AE38626D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD99D42D-60FD-45D8-9F55-BE3AE38626D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD99D42D-60FD-45D8-9F55-BE3AE38626D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F985DC40-F983-4464-B866-3BD17EE3B6B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F985DC40-F983-4464-B866-3BD17EE3B6B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F985DC40-F983-4464-B866-3BD17EE3B6B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F985DC40-F983-4464-B866-3BD17EE3B6B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7FEEB55-F4A7-4677-AFD5-7DE90A4897AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA01DAC4-CE5D-43AD-9FC3-F8DBE5F1952A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31FFC3D4-26EA-4261-81B1-380A4E5C4A6B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{494E2DDD-4224-49E0-A747-26F948EBACFA} = {5A85C3DC-D0CF-4A03-9071-0C6C29B63856}
-		{E9266982-7205-46C8-B457-CCF450959793} = {F39ECBD1-A0AC-4195-BCA9-2B8789853CDE}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {99152235-4454-4EC0-9FE4-C332E192CA51}
+		SolutionGuid = {ADEB1F74-B672-4B9F-A221-7A548028621F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln b/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln
index d4a33ffc4c58c9..3e4c24e391e2f0 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Composite/Microsoft.Extensions.FileProviders.Composite.sln
@@ -1,55 +1,114 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B269123A-BA35-48E3-84CA-A2DC821D20B4}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{38BD2606-E0D9-4016-A422-02062CE206A1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{286582BD-078C-4705-BB1F-8AC3D8C35DCE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{0AF0AB89-EB1B-449B-B96C-1120B4261D47}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{17B68FB8-5750-412A-BE2F-0958142CB101}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{4A904B1E-5710-4D31-A734-33C734C9D989}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Composite", "ref\Microsoft.Extensions.FileProviders.Composite.csproj", "{3AD7B949-DC7D-46E9-9781-47F631D11E79}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Composite", "ref\Microsoft.Extensions.FileProviders.Composite.csproj", "{BEB0AB80-D91D-4C29-B07A-9C2673DA4E29}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Composite", "src\Microsoft.Extensions.FileProviders.Composite.csproj", "{F9BB5B79-96EE-4255-A458-88E896E2FB5B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Composite", "src\Microsoft.Extensions.FileProviders.Composite.csproj", "{7A8F66B3-8D37-4D83-B54F-0955EC11F675}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Composite.Tests", "tests\Microsoft.Extensions.FileProviders.Composite.Tests.csproj", "{20A287F1-DC01-4569-851B-A54016B54618}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Composite.Tests", "tests\Microsoft.Extensions.FileProviders.Composite.Tests.csproj", "{69D9DAD7-0683-49B2-99E5-FBEBE5803C02}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DBBD82F2-6CC9-4FE1-B020-2F71E652104E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{22E22108-1ED0-4295-8CCC-2BBBAFA3DF78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{78990065-E5F9-46C6-9388-E709261249D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ABD00CF3-0D7E-42A1-B685-4127238C1534}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F79164E2-EC00-4A9C-995D-64E9BCD6645B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1205C9A5-117C-4119-965F-AE60C4874D0B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{8894F669-048B-46C7-AB5D-4B274E42EF6F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{99C62D43-9258-412B-AFB6-3D2DD92AF8F7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{11C6D5C0-7934-4F47-A800-60BBAAA16033}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{38BD2606-E0D9-4016-A422-02062CE206A1} = {99C62D43-9258-412B-AFB6-3D2DD92AF8F7}
+		{69D9DAD7-0683-49B2-99E5-FBEBE5803C02} = {99C62D43-9258-412B-AFB6-3D2DD92AF8F7}
+		{0AF0AB89-EB1B-449B-B96C-1120B4261D47} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{BEB0AB80-D91D-4C29-B07A-9C2673DA4E29} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{22E22108-1ED0-4295-8CCC-2BBBAFA3DF78} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{78990065-E5F9-46C6-9388-E709261249D2} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{ABD00CF3-0D7E-42A1-B685-4127238C1534} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{1205C9A5-117C-4119-965F-AE60C4874D0B} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{8894F669-048B-46C7-AB5D-4B274E42EF6F} = {CF86CB89-9D65-41F9-BE4F-8BAB15D4A81E}
+		{4A904B1E-5710-4D31-A734-33C734C9D989} = {11C6D5C0-7934-4F47-A800-60BBAAA16033}
+		{7A8F66B3-8D37-4D83-B54F-0955EC11F675} = {11C6D5C0-7934-4F47-A800-60BBAAA16033}
+		{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3} = {11C6D5C0-7934-4F47-A800-60BBAAA16033}
+		{F79164E2-EC00-4A9C-995D-64E9BCD6645B} = {11C6D5C0-7934-4F47-A800-60BBAAA16033}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3AD7B949-DC7D-46E9-9781-47F631D11E79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AD7B949-DC7D-46E9-9781-47F631D11E79}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AD7B949-DC7D-46E9-9781-47F631D11E79}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AD7B949-DC7D-46E9-9781-47F631D11E79}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9BB5B79-96EE-4255-A458-88E896E2FB5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9BB5B79-96EE-4255-A458-88E896E2FB5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9BB5B79-96EE-4255-A458-88E896E2FB5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9BB5B79-96EE-4255-A458-88E896E2FB5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20A287F1-DC01-4569-851B-A54016B54618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20A287F1-DC01-4569-851B-A54016B54618}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20A287F1-DC01-4569-851B-A54016B54618}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20A287F1-DC01-4569-851B-A54016B54618}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBBD82F2-6CC9-4FE1-B020-2F71E652104E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBBD82F2-6CC9-4FE1-B020-2F71E652104E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBBD82F2-6CC9-4FE1-B020-2F71E652104E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBBD82F2-6CC9-4FE1-B020-2F71E652104E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38BD2606-E0D9-4016-A422-02062CE206A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38BD2606-E0D9-4016-A422-02062CE206A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38BD2606-E0D9-4016-A422-02062CE206A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38BD2606-E0D9-4016-A422-02062CE206A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AF0AB89-EB1B-449B-B96C-1120B4261D47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AF0AB89-EB1B-449B-B96C-1120B4261D47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AF0AB89-EB1B-449B-B96C-1120B4261D47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AF0AB89-EB1B-449B-B96C-1120B4261D47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A904B1E-5710-4D31-A734-33C734C9D989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A904B1E-5710-4D31-A734-33C734C9D989}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A904B1E-5710-4D31-A734-33C734C9D989}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A904B1E-5710-4D31-A734-33C734C9D989}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEB0AB80-D91D-4C29-B07A-9C2673DA4E29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEB0AB80-D91D-4C29-B07A-9C2673DA4E29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEB0AB80-D91D-4C29-B07A-9C2673DA4E29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEB0AB80-D91D-4C29-B07A-9C2673DA4E29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A8F66B3-8D37-4D83-B54F-0955EC11F675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A8F66B3-8D37-4D83-B54F-0955EC11F675}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A8F66B3-8D37-4D83-B54F-0955EC11F675}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A8F66B3-8D37-4D83-B54F-0955EC11F675}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69D9DAD7-0683-49B2-99E5-FBEBE5803C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69D9DAD7-0683-49B2-99E5-FBEBE5803C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69D9DAD7-0683-49B2-99E5-FBEBE5803C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69D9DAD7-0683-49B2-99E5-FBEBE5803C02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22E22108-1ED0-4295-8CCC-2BBBAFA3DF78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22E22108-1ED0-4295-8CCC-2BBBAFA3DF78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22E22108-1ED0-4295-8CCC-2BBBAFA3DF78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22E22108-1ED0-4295-8CCC-2BBBAFA3DF78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC76C7E7-C2C3-43D0-99AE-C77E8402FBE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78990065-E5F9-46C6-9388-E709261249D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78990065-E5F9-46C6-9388-E709261249D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78990065-E5F9-46C6-9388-E709261249D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78990065-E5F9-46C6-9388-E709261249D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABD00CF3-0D7E-42A1-B685-4127238C1534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABD00CF3-0D7E-42A1-B685-4127238C1534}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABD00CF3-0D7E-42A1-B685-4127238C1534}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABD00CF3-0D7E-42A1-B685-4127238C1534}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F79164E2-EC00-4A9C-995D-64E9BCD6645B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1205C9A5-117C-4119-965F-AE60C4874D0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1205C9A5-117C-4119-965F-AE60C4874D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1205C9A5-117C-4119-965F-AE60C4874D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1205C9A5-117C-4119-965F-AE60C4874D0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8894F669-048B-46C7-AB5D-4B274E42EF6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8894F669-048B-46C7-AB5D-4B274E42EF6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8894F669-048B-46C7-AB5D-4B274E42EF6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8894F669-048B-46C7-AB5D-4B274E42EF6F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3AD7B949-DC7D-46E9-9781-47F631D11E79} = {B269123A-BA35-48E3-84CA-A2DC821D20B4}
-		{F9BB5B79-96EE-4255-A458-88E896E2FB5B} = {286582BD-078C-4705-BB1F-8AC3D8C35DCE}
-		{20A287F1-DC01-4569-851B-A54016B54618} = {17B68FB8-5750-412A-BE2F-0958142CB101}
-		{DBBD82F2-6CC9-4FE1-B020-2F71E652104E} = {17B68FB8-5750-412A-BE2F-0958142CB101}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1B4A0C76-E4FA-4FEC-A04D-F71987BB8830}
+		SolutionGuid = {2C4F880D-DD85-46A9-881C-94C75D87D8A9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln
index 1c6e0abf9d6420..abe5b371c0030e 100644
--- a/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln
+++ b/src/libraries/Microsoft.Extensions.FileProviders.Physical/Microsoft.Extensions.FileProviders.Physical.sln
@@ -1,55 +1,128 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{40FA757C-F51D-4AA8-8C3C-C203A1B555EF}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5F693912-195A-4F0E-920C-0C27D23AFDB7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7A3F7C8-9DD2-47DD-80C7-D35F99CB6354}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{5EACA25A-C547-4F4F-A6C3-8D972A419928}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{785DABFE-84C2-41F8-BC8A-6FA59830FBE5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{907217D6-8690-4213-AD96-BA67A47499BF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{70816D5C-D75E-4D71-9869-9DAB8FFB9527}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{BBF27B04-4E1A-482C-93BE-8F887773055A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "src\Microsoft.Extensions.FileProviders.Physical.csproj", "{22648DDF-2A47-4754-B024-059AC14A8937}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "src\Microsoft.Extensions.FileProviders.Physical.csproj", "{55A66A71-A400-4A36-9A19-9F8B549647D7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical.Tests", "tests\Microsoft.Extensions.FileProviders.Physical.Tests.csproj", "{060CD42A-BFEF-4F86-BFA1-6BDF4A64F3F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical.Tests", "tests\Microsoft.Extensions.FileProviders.Physical.Tests.csproj", "{63048457-9BE1-4C54-8581-ADF6F6D3D271}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6BFBACB5-01F5-4767-AE92-F211C9CA71FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{85AC9873-8EE8-411C-A2B0-EBB910F9AB9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{DBE052B4-23A7-4F40-BFFE-9604E39AAACF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{AB2263E5-4509-4A94-BA1F-76451502DC6D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{C55245FA-CAA6-43F7-917C-602E97BC8D52}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0BE2B76F-6237-4A38-953F-11717E757891}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{54BEF25B-96F5-464D-BAD5-11E49854D244}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AD097226-D10B-4423-BED6-49C3FF58A658}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{67799EB0-2D37-4EA3-A33D-C2CB3B48FFE0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{CE9C3977-A043-451B-97BB-C33496C458C8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{234D9C02-1797-4A0B-B396-FB960B09C095}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AFD6947A-A0BE-4F4A-84E4-121E1692E90B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5CFE2A6-320A-4D38-881B-03A1B4404FC0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5F693912-195A-4F0E-920C-0C27D23AFDB7} = {234D9C02-1797-4A0B-B396-FB960B09C095}
+		{63048457-9BE1-4C54-8581-ADF6F6D3D271} = {234D9C02-1797-4A0B-B396-FB960B09C095}
+		{5EACA25A-C547-4F4F-A6C3-8D972A419928} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{BBF27B04-4E1A-482C-93BE-8F887773055A} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{85AC9873-8EE8-411C-A2B0-EBB910F9AB9A} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{AB2263E5-4509-4A94-BA1F-76451502DC6D} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{0BE2B76F-6237-4A38-953F-11717E757891} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{54BEF25B-96F5-464D-BAD5-11E49854D244} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{67799EB0-2D37-4EA3-A33D-C2CB3B48FFE0} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{CE9C3977-A043-451B-97BB-C33496C458C8} = {AFD6947A-A0BE-4F4A-84E4-121E1692E90B}
+		{907217D6-8690-4213-AD96-BA67A47499BF} = {B5CFE2A6-320A-4D38-881B-03A1B4404FC0}
+		{55A66A71-A400-4A36-9A19-9F8B549647D7} = {B5CFE2A6-320A-4D38-881B-03A1B4404FC0}
+		{DBE052B4-23A7-4F40-BFFE-9604E39AAACF} = {B5CFE2A6-320A-4D38-881B-03A1B4404FC0}
+		{C55245FA-CAA6-43F7-917C-602E97BC8D52} = {B5CFE2A6-320A-4D38-881B-03A1B4404FC0}
+		{AD097226-D10B-4423-BED6-49C3FF58A658} = {B5CFE2A6-320A-4D38-881B-03A1B4404FC0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{70816D5C-D75E-4D71-9869-9DAB8FFB9527}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70816D5C-D75E-4D71-9869-9DAB8FFB9527}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70816D5C-D75E-4D71-9869-9DAB8FFB9527}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70816D5C-D75E-4D71-9869-9DAB8FFB9527}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22648DDF-2A47-4754-B024-059AC14A8937}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22648DDF-2A47-4754-B024-059AC14A8937}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22648DDF-2A47-4754-B024-059AC14A8937}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22648DDF-2A47-4754-B024-059AC14A8937}.Release|Any CPU.Build.0 = Release|Any CPU
-		{060CD42A-BFEF-4F86-BFA1-6BDF4A64F3F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{060CD42A-BFEF-4F86-BFA1-6BDF4A64F3F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{060CD42A-BFEF-4F86-BFA1-6BDF4A64F3F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{060CD42A-BFEF-4F86-BFA1-6BDF4A64F3F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BFBACB5-01F5-4767-AE92-F211C9CA71FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BFBACB5-01F5-4767-AE92-F211C9CA71FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BFBACB5-01F5-4767-AE92-F211C9CA71FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BFBACB5-01F5-4767-AE92-F211C9CA71FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F693912-195A-4F0E-920C-0C27D23AFDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F693912-195A-4F0E-920C-0C27D23AFDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F693912-195A-4F0E-920C-0C27D23AFDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F693912-195A-4F0E-920C-0C27D23AFDB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EACA25A-C547-4F4F-A6C3-8D972A419928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EACA25A-C547-4F4F-A6C3-8D972A419928}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EACA25A-C547-4F4F-A6C3-8D972A419928}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EACA25A-C547-4F4F-A6C3-8D972A419928}.Release|Any CPU.Build.0 = Release|Any CPU
+		{907217D6-8690-4213-AD96-BA67A47499BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{907217D6-8690-4213-AD96-BA67A47499BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{907217D6-8690-4213-AD96-BA67A47499BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{907217D6-8690-4213-AD96-BA67A47499BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBF27B04-4E1A-482C-93BE-8F887773055A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBF27B04-4E1A-482C-93BE-8F887773055A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBF27B04-4E1A-482C-93BE-8F887773055A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBF27B04-4E1A-482C-93BE-8F887773055A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55A66A71-A400-4A36-9A19-9F8B549647D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55A66A71-A400-4A36-9A19-9F8B549647D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55A66A71-A400-4A36-9A19-9F8B549647D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55A66A71-A400-4A36-9A19-9F8B549647D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63048457-9BE1-4C54-8581-ADF6F6D3D271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63048457-9BE1-4C54-8581-ADF6F6D3D271}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63048457-9BE1-4C54-8581-ADF6F6D3D271}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63048457-9BE1-4C54-8581-ADF6F6D3D271}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85AC9873-8EE8-411C-A2B0-EBB910F9AB9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85AC9873-8EE8-411C-A2B0-EBB910F9AB9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85AC9873-8EE8-411C-A2B0-EBB910F9AB9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85AC9873-8EE8-411C-A2B0-EBB910F9AB9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBE052B4-23A7-4F40-BFFE-9604E39AAACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBE052B4-23A7-4F40-BFFE-9604E39AAACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBE052B4-23A7-4F40-BFFE-9604E39AAACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBE052B4-23A7-4F40-BFFE-9604E39AAACF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB2263E5-4509-4A94-BA1F-76451502DC6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB2263E5-4509-4A94-BA1F-76451502DC6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB2263E5-4509-4A94-BA1F-76451502DC6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB2263E5-4509-4A94-BA1F-76451502DC6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C55245FA-CAA6-43F7-917C-602E97BC8D52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BE2B76F-6237-4A38-953F-11717E757891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BE2B76F-6237-4A38-953F-11717E757891}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BE2B76F-6237-4A38-953F-11717E757891}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BE2B76F-6237-4A38-953F-11717E757891}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54BEF25B-96F5-464D-BAD5-11E49854D244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54BEF25B-96F5-464D-BAD5-11E49854D244}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54BEF25B-96F5-464D-BAD5-11E49854D244}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54BEF25B-96F5-464D-BAD5-11E49854D244}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD097226-D10B-4423-BED6-49C3FF58A658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD097226-D10B-4423-BED6-49C3FF58A658}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD097226-D10B-4423-BED6-49C3FF58A658}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD097226-D10B-4423-BED6-49C3FF58A658}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67799EB0-2D37-4EA3-A33D-C2CB3B48FFE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67799EB0-2D37-4EA3-A33D-C2CB3B48FFE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67799EB0-2D37-4EA3-A33D-C2CB3B48FFE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67799EB0-2D37-4EA3-A33D-C2CB3B48FFE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE9C3977-A043-451B-97BB-C33496C458C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE9C3977-A043-451B-97BB-C33496C458C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE9C3977-A043-451B-97BB-C33496C458C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE9C3977-A043-451B-97BB-C33496C458C8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{70816D5C-D75E-4D71-9869-9DAB8FFB9527} = {40FA757C-F51D-4AA8-8C3C-C203A1B555EF}
-		{22648DDF-2A47-4754-B024-059AC14A8937} = {E7A3F7C8-9DD2-47DD-80C7-D35F99CB6354}
-		{060CD42A-BFEF-4F86-BFA1-6BDF4A64F3F3} = {785DABFE-84C2-41F8-BC8A-6FA59830FBE5}
-		{6BFBACB5-01F5-4767-AE92-F211C9CA71FC} = {785DABFE-84C2-41F8-BC8A-6FA59830FBE5}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {775376C7-9426-4CD9-88C4-70726CDAA954}
+		SolutionGuid = {4B425DE1-F167-465F-97A1-FA1E8C63DFB8}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
index 2e49a08654fa4f..9e7617d720a3a5 100644
--- a/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
+++ b/src/libraries/Microsoft.Extensions.FileSystemGlobbing/Microsoft.Extensions.FileSystemGlobbing.sln
@@ -1,54 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{A9547748-8B4F-450E-B0E3-CD9A1A80B319}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing.Tests", "tests\Microsoft.Extensions.FileSystemGlobbing.Tests.csproj", "{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing.Tests", "tests\Microsoft.Extensions.FileSystemGlobbing.Tests.csproj", "{79B284F9-326E-4FEB-9A32-EA72A31B4B60}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4BDF1437-D88A-4E3E-9C32-8B4D34129B37}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{81FA9ECC-2671-4077-8F6F-2F8538917512}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2CCD7884-930F-420F-B559-3EB1EB9AF754}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{965074B0-3EC8-426A-B944-EF60C78DC6BD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{0206FF1D-8036-4228-81CC-81B9602BF11F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{5158D9CE-B5AF-404D-8F87-DB575FA59148}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{24FACEAC-26F6-4570-8AB3-0C1081D0FFB1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{26034E74-B1B3-4B68-A217-0E4D47DD6E55}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{86A9B48A-2A11-4AF5-B383-5A5F6DB7EAE8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2} = {24FACEAC-26F6-4570-8AB3-0C1081D0FFB1}
+		{79B284F9-326E-4FEB-9A32-EA72A31B4B60} = {24FACEAC-26F6-4570-8AB3-0C1081D0FFB1}
+		{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55} = {26034E74-B1B3-4B68-A217-0E4D47DD6E55}
+		{4BDF1437-D88A-4E3E-9C32-8B4D34129B37} = {26034E74-B1B3-4B68-A217-0E4D47DD6E55}
+		{81FA9ECC-2671-4077-8F6F-2F8538917512} = {26034E74-B1B3-4B68-A217-0E4D47DD6E55}
+		{0206FF1D-8036-4228-81CC-81B9602BF11F} = {26034E74-B1B3-4B68-A217-0E4D47DD6E55}
+		{5158D9CE-B5AF-404D-8F87-DB575FA59148} = {26034E74-B1B3-4B68-A217-0E4D47DD6E55}
+		{A9547748-8B4F-450E-B0E3-CD9A1A80B319} = {86A9B48A-2A11-4AF5-B383-5A5F6DB7EAE8}
+		{965074B0-3EC8-426A-B944-EF60C78DC6BD} = {86A9B48A-2A11-4AF5-B383-5A5F6DB7EAE8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CCD7884-930F-420F-B559-3EB1EB9AF754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CCD7884-930F-420F-B559-3EB1EB9AF754}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CCD7884-930F-420F-B559-3EB1EB9AF754}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CCD7884-930F-420F-B559-3EB1EB9AF754}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C76E62F8-C898-4A2A-8D5C-EEE1D4505DF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECFF7A87-0D5F-4EA1-9FED-1126A51B5D55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9547748-8B4F-450E-B0E3-CD9A1A80B319}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9547748-8B4F-450E-B0E3-CD9A1A80B319}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9547748-8B4F-450E-B0E3-CD9A1A80B319}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9547748-8B4F-450E-B0E3-CD9A1A80B319}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79B284F9-326E-4FEB-9A32-EA72A31B4B60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BDF1437-D88A-4E3E-9C32-8B4D34129B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BDF1437-D88A-4E3E-9C32-8B4D34129B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BDF1437-D88A-4E3E-9C32-8B4D34129B37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BDF1437-D88A-4E3E-9C32-8B4D34129B37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81FA9ECC-2671-4077-8F6F-2F8538917512}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81FA9ECC-2671-4077-8F6F-2F8538917512}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81FA9ECC-2671-4077-8F6F-2F8538917512}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81FA9ECC-2671-4077-8F6F-2F8538917512}.Release|Any CPU.Build.0 = Release|Any CPU
+		{965074B0-3EC8-426A-B944-EF60C78DC6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{965074B0-3EC8-426A-B944-EF60C78DC6BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{965074B0-3EC8-426A-B944-EF60C78DC6BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{965074B0-3EC8-426A-B944-EF60C78DC6BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0206FF1D-8036-4228-81CC-81B9602BF11F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0206FF1D-8036-4228-81CC-81B9602BF11F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0206FF1D-8036-4228-81CC-81B9602BF11F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0206FF1D-8036-4228-81CC-81B9602BF11F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5158D9CE-B5AF-404D-8F87-DB575FA59148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5158D9CE-B5AF-404D-8F87-DB575FA59148}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5158D9CE-B5AF-404D-8F87-DB575FA59148}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5158D9CE-B5AF-404D-8F87-DB575FA59148}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5E9F6F6C-6B42-42FC-A2C0-2D63B01351F1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{58A26DC9-8A10-4F32-927C-D6E2A1B99E1B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{49CB4AB9-5D76-481D-9FFA-458C9AC394EF} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{2CCD7884-930F-420F-B559-3EB1EB9AF754} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {904B2FDB-F1D7-4CE0-B0CD-FFDF8C51FDF8}
+		SolutionGuid = {4FA3B475-4D82-4A80-8625-D5C98B8FF794}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln
index b00052a93019e2..b83f628b5790cc 100644
--- a/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting.Abstractions/Microsoft.Extensions.Hosting.Abstractions.sln
@@ -1,39 +1,126 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2F161FD0-DA88-4BA3-A48E-2879C7734558}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{D1DAA13A-B302-46AB-965A-7610EE55F588}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1BF911EE-2F22-42E1-86B7-7280A2F59A8A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{E9CC25E1-367A-41E4-A710-5C5AB7475F40}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "ref\Microsoft.Extensions.Hosting.Abstractions.csproj", "{85AB8AEB-9E14-4A4F-95B5-62AEFB8E67F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{47F05662-AD13-4955-A205-0FCE6913FDDB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "src\Microsoft.Extensions.Hosting.Abstractions.csproj", "{62BE2C90-52F4-491F-9872-8A25CBA5C421}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{7F238E01-3021-4F87-B463-A4AB5B91F753}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{963867EB-DEAF-487E-A3E8-71AE9379AD53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{60641184-B841-4F48-A917-76618114916A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{08064208-D005-4C34-B152-D03C7D173D60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{17917EA7-19F2-4CC0-AD52-B04AA4D254F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "ref\Microsoft.Extensions.Hosting.Abstractions.csproj", "{7CCF5CE0-3840-4AA1-810F-138D001F2486}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "src\Microsoft.Extensions.Hosting.Abstractions.csproj", "{664450C6-102A-435A-875B-3445B3332E90}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{C4FD2984-3E22-47AF-8584-FF908D9D3E43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{99CF7377-8E77-4EDB-B04F-E546ACCCE84D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{A7370C94-090B-4F79-A964-8029481D60FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AF34ED02-1B95-41DE-A693-800E2770C5FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{56FC08B2-891F-42C3-8593-C01C447EB5CB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FC1D54EA-7DFF-4346-801B-1D269A3176E5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D1DAA13A-B302-46AB-965A-7610EE55F588} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{47F05662-AD13-4955-A205-0FCE6913FDDB} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{963867EB-DEAF-487E-A3E8-71AE9379AD53} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{08064208-D005-4C34-B152-D03C7D173D60} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{7CCF5CE0-3840-4AA1-810F-138D001F2486} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{C4FD2984-3E22-47AF-8584-FF908D9D3E43} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{99CF7377-8E77-4EDB-B04F-E546ACCCE84D} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{AF34ED02-1B95-41DE-A693-800E2770C5FA} = {FC1D54EA-7DFF-4346-801B-1D269A3176E5}
+		{E9CC25E1-367A-41E4-A710-5C5AB7475F40} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+		{7F238E01-3021-4F87-B463-A4AB5B91F753} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+		{60641184-B841-4F48-A917-76618114916A} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+		{17917EA7-19F2-4CC0-AD52-B04AA4D254F8} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+		{664450C6-102A-435A-875B-3445B3332E90} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+		{A7370C94-090B-4F79-A964-8029481D60FC} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+		{56FC08B2-891F-42C3-8593-C01C447EB5CB} = {100E6D7E-E8D6-4BD1-8C47-35471D13DBBA}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{85AB8AEB-9E14-4A4F-95B5-62AEFB8E67F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85AB8AEB-9E14-4A4F-95B5-62AEFB8E67F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85AB8AEB-9E14-4A4F-95B5-62AEFB8E67F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85AB8AEB-9E14-4A4F-95B5-62AEFB8E67F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62BE2C90-52F4-491F-9872-8A25CBA5C421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62BE2C90-52F4-491F-9872-8A25CBA5C421}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62BE2C90-52F4-491F-9872-8A25CBA5C421}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62BE2C90-52F4-491F-9872-8A25CBA5C421}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1DAA13A-B302-46AB-965A-7610EE55F588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1DAA13A-B302-46AB-965A-7610EE55F588}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1DAA13A-B302-46AB-965A-7610EE55F588}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1DAA13A-B302-46AB-965A-7610EE55F588}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9CC25E1-367A-41E4-A710-5C5AB7475F40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47F05662-AD13-4955-A205-0FCE6913FDDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47F05662-AD13-4955-A205-0FCE6913FDDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47F05662-AD13-4955-A205-0FCE6913FDDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47F05662-AD13-4955-A205-0FCE6913FDDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F238E01-3021-4F87-B463-A4AB5B91F753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F238E01-3021-4F87-B463-A4AB5B91F753}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F238E01-3021-4F87-B463-A4AB5B91F753}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F238E01-3021-4F87-B463-A4AB5B91F753}.Release|Any CPU.Build.0 = Release|Any CPU
+		{963867EB-DEAF-487E-A3E8-71AE9379AD53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{963867EB-DEAF-487E-A3E8-71AE9379AD53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{963867EB-DEAF-487E-A3E8-71AE9379AD53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{963867EB-DEAF-487E-A3E8-71AE9379AD53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60641184-B841-4F48-A917-76618114916A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60641184-B841-4F48-A917-76618114916A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60641184-B841-4F48-A917-76618114916A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60641184-B841-4F48-A917-76618114916A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08064208-D005-4C34-B152-D03C7D173D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08064208-D005-4C34-B152-D03C7D173D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08064208-D005-4C34-B152-D03C7D173D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08064208-D005-4C34-B152-D03C7D173D60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17917EA7-19F2-4CC0-AD52-B04AA4D254F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17917EA7-19F2-4CC0-AD52-B04AA4D254F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17917EA7-19F2-4CC0-AD52-B04AA4D254F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17917EA7-19F2-4CC0-AD52-B04AA4D254F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CCF5CE0-3840-4AA1-810F-138D001F2486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CCF5CE0-3840-4AA1-810F-138D001F2486}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CCF5CE0-3840-4AA1-810F-138D001F2486}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CCF5CE0-3840-4AA1-810F-138D001F2486}.Release|Any CPU.Build.0 = Release|Any CPU
+		{664450C6-102A-435A-875B-3445B3332E90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{664450C6-102A-435A-875B-3445B3332E90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{664450C6-102A-435A-875B-3445B3332E90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{664450C6-102A-435A-875B-3445B3332E90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4FD2984-3E22-47AF-8584-FF908D9D3E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4FD2984-3E22-47AF-8584-FF908D9D3E43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4FD2984-3E22-47AF-8584-FF908D9D3E43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4FD2984-3E22-47AF-8584-FF908D9D3E43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99CF7377-8E77-4EDB-B04F-E546ACCCE84D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99CF7377-8E77-4EDB-B04F-E546ACCCE84D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99CF7377-8E77-4EDB-B04F-E546ACCCE84D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99CF7377-8E77-4EDB-B04F-E546ACCCE84D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7370C94-090B-4F79-A964-8029481D60FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7370C94-090B-4F79-A964-8029481D60FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7370C94-090B-4F79-A964-8029481D60FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7370C94-090B-4F79-A964-8029481D60FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF34ED02-1B95-41DE-A693-800E2770C5FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF34ED02-1B95-41DE-A693-800E2770C5FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF34ED02-1B95-41DE-A693-800E2770C5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF34ED02-1B95-41DE-A693-800E2770C5FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56FC08B2-891F-42C3-8593-C01C447EB5CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56FC08B2-891F-42C3-8593-C01C447EB5CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56FC08B2-891F-42C3-8593-C01C447EB5CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56FC08B2-891F-42C3-8593-C01C447EB5CB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{85AB8AEB-9E14-4A4F-95B5-62AEFB8E67F8} = {2F161FD0-DA88-4BA3-A48E-2879C7734558}
-		{62BE2C90-52F4-491F-9872-8A25CBA5C421} = {1BF911EE-2F22-42E1-86B7-7280A2F59A8A}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3B7C5F78-F344-432F-8847-720BBC8A2658}
+		SolutionGuid = {7897D6F2-D18F-4ABB-9698-593AE45059C5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
index 5d081f8c4659ba..c5c2c74b016550 100644
--- a/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
+++ b/src/libraries/Microsoft.Extensions.Hosting/Microsoft.Extensions.Hosting.sln
@@ -1,92 +1,562 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{23DF8E80-C5C7-4D64-B0D4-F4D33A9646A1}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{BCAE2699-A994-48FE-B9B0-5580D267BD2E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2BCD92F1-BA65-4145-A650-8BADD26EE5D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{47ACDB6F-34CB-478D-9E43-F3662EE5838D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{635786A7-1A3B-46BB-9367-DE57F7032900}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{C24E4188-27CB-4E00-A5F0-62AE23D536EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "ref\Microsoft.Extensions.Hosting.csproj", "{4A22EFFF-5422-4D05-9194-C06EADE60E0B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{EDAC3418-1D4E-4216-9371-0A36EA1E13FE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "src\Microsoft.Extensions.Hosting.csproj", "{50FED4CD-4338-431A-B058-21255B49A4B9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{020874FC-11A2-4FC7-8929-527462F8819A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApp", "TestApp", "{6FB3A6E1-7322-4CBC-A44E-5993FC2085C1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{670AB88D-85C9-4674-A652-C27488ED73F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.TestApp", "tests\TestApp\Microsoft.Extensions.Hosting.TestApp.csproj", "{8985343B-73BD-4513-B98A-BC7F4CE63F88}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{3411D565-223A-44B5-864C-E30F826001B4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FunctionalTests", "FunctionalTests", "{EB3CB906-BAB0-4A90-BE2F-BBFE47B036C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "..\Microsoft.Extensions.Configuration.CommandLine\ref\Microsoft.Extensions.Configuration.CommandLine.csproj", "{4AB3E652-6709-4011-AC2F-C379A0415BAC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{FE4AAEDA-1D08-4C9A-B61C-8A7156000E43}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "..\Microsoft.Extensions.Configuration.CommandLine\src\Microsoft.Extensions.Configuration.CommandLine.csproj", "{ECA6E734-3908-45B4-9DFA-FDDA49AD620D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Unit.Tests", "tests\UnitTests\Microsoft.Extensions.Hosting.Unit.Tests.csproj", "{4E52FAB8-83A4-4F81-AFED-072BF13D0F46}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "..\Microsoft.Extensions.Configuration.EnvironmentVariables\ref\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{3D657A5A-C7DF-4817-864F-944755DCE6DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Functional.Tests", "tests\FunctionalTests\Microsoft.Extensions.Hosting.Functional.Tests.csproj", "{49ED668A-7FCB-455B-B3B4-26C004172531}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "..\Microsoft.Extensions.Configuration.EnvironmentVariables\src\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{0C041643-1217-466B-AF2E-1E44C7B117B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{602F282E-2829-4C7D-B960-A8D31F326E9F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{BD938E1D-6FC8-4D46-B103-B4D35761CEA2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "..\Microsoft.Extensions.Hosting.Abstractions\ref\Microsoft.Extensions.Hosting.Abstractions.csproj", "{BAD57E10-C310-4BED-A4BF-7B02B1AC35BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{6DB8DE55-5419-48EA-B4CD-2880E00409FB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "..\Microsoft.Extensions.Hosting.Abstractions\src\Microsoft.Extensions.Hosting.Abstractions.csproj", "{0468E166-54DE-4DB7-A2DF-42214A39C392}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj", "{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj", "{0A738527-821F-4089-B64E-3C0F4714DC78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "..\Microsoft.Extensions.Configuration.UserSecrets\ref\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{37A36947-2652-4AFD-BCF8-AAFD4D4D2827}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "..\Microsoft.Extensions.Configuration.UserSecrets\src\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{EA9E6747-867B-4312-94B3-624EEB1C7A7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{13BC7AAA-7831-4500-9D28-A93FA4CA3C74}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{EB889E78-AE59-4D41-AC29-8BC4D58BCE16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{135F551E-ACB8-4073-ABB5-A1FA558455DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{5532E155-E423-4FFD-B009-80B4281D36BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{24220AD7-03ED-427A-BFC8-114C475EAD0F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{0A021166-613C-430C-8460-50F1E0DF7AD8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{1E3D564C-A79E-4E28-8E13-626EE7780831}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{E4157F2E-F11D-48C6-A146-B4D12D9211F7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "..\Microsoft.Extensions.Hosting.Abstractions\ref\Microsoft.Extensions.Hosting.Abstractions.csproj", "{2F25C0DB-E010-4802-8030-C88E2D09D3B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Abstractions", "..\Microsoft.Extensions.Hosting.Abstractions\src\Microsoft.Extensions.Hosting.Abstractions.csproj", "{973CE6DA-B55D-4E55-88D5-53BE69D44410}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "ref\Microsoft.Extensions.Hosting.csproj", "{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting", "src\Microsoft.Extensions.Hosting.csproj", "{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Functional.Tests", "tests\FunctionalTests\Microsoft.Extensions.Hosting.Functional.Tests.csproj", "{2A882DCC-96C1-4EDF-A7F0-B526EC81533F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.TestApp", "tests\TestApp\Microsoft.Extensions.Hosting.TestApp.csproj", "{495208B7-31BB-4802-A769-CEE4917BDF75}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Hosting.Unit.Tests", "tests\UnitTests\Microsoft.Extensions.Hosting.Unit.Tests.csproj", "{33C3D8F0-297F-4471-92B0-F4E8717F10E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{42E1BF94-6FE0-4017-9702-55913BD95EDE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{8845E6FF-94B2-4994-A8F4-DF30844A2168}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "..\Microsoft.Extensions.Logging.Configuration\ref\Microsoft.Extensions.Logging.Configuration.csproj", "{15AD68F8-6C58-41A3-99B3-558C42A6E7A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "..\Microsoft.Extensions.Logging.Configuration\src\Microsoft.Extensions.Logging.Configuration.csproj", "{99C8FB58-8718-4E76-AEFA-3C42F2F729B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "..\Microsoft.Extensions.Logging.Console\ref\Microsoft.Extensions.Logging.Console.csproj", "{28C9D427-83BA-46A6-BEF5-6994A07F2258}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "..\Microsoft.Extensions.Logging.Console\src\Microsoft.Extensions.Logging.Console.csproj", "{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "..\Microsoft.Extensions.Logging.Debug\ref\Microsoft.Extensions.Logging.Debug.csproj", "{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "..\Microsoft.Extensions.Logging.Debug\src\Microsoft.Extensions.Logging.Debug.csproj", "{B729474D-0E96-4296-B317-450EE24F6B48}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "..\Microsoft.Extensions.Logging.EventLog\ref\Microsoft.Extensions.Logging.EventLog.csproj", "{9ADBD2EE-D390-490C-BBEA-F844FE6F371E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "..\Microsoft.Extensions.Logging.EventLog\src\Microsoft.Extensions.Logging.EventLog.csproj", "{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource", "..\Microsoft.Extensions.Logging.EventSource\ref\Microsoft.Extensions.Logging.EventSource.csproj", "{465AE1C4-84DD-4864-916A-74D89DC3BBBC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource", "..\Microsoft.Extensions.Logging.EventSource\src\Microsoft.Extensions.Logging.EventSource.csproj", "{D466E363-F930-4D26-AE55-0256182961DD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{D69326FC-CD05-4690-91C0-1537A80ACBFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{DD121F9F-3548-4247-8E10-FB584FC0827C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{25C5119A-AAFB-4C74-9E12-F747CA4D80E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{45235656-E284-4682-BE70-9A284FD73243}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0C6A47C7-7405-4D77-83E1-BC08A88B687B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{DFF6CFBA-1F4A-4063-AD4C-C11E959DB004}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{30979D28-B876-4F1B-A68A-562989414F8F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{1E322AE1-E7C1-438B-805E-63436D3DEA7E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{40F921D6-E86F-4C7B-895D-9B7E96FBC00D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{827FBB8F-C569-4AC7-82FD-9EC2AE3AF7CC}"
+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.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{94F2567E-9746-4A82-804A-C999D33A286A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EF1D64A4-6253-460A-B479-73388F98FFF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{6A7F6CF5-1085-4F07-AB0E-00F25E407599}"
+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", "..\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\src\System.Threading.AccessControl.csproj", "{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{5AAA0A78-071A-465C-A98C-CFFAAD013A32}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{31B28F7B-070E-40AB-BCAA-E8B9A32EF1A6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F384323D-F81E-44FA-A56B-38714905FA81}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{10235C29-9434-4A37-969D-83F09076D8EC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{BCAE2699-A994-48FE-B9B0-5580D267BD2E} = {31B28F7B-070E-40AB-BCAA-E8B9A32EF1A6}
+		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F} = {31B28F7B-070E-40AB-BCAA-E8B9A32EF1A6}
+		{495208B7-31BB-4802-A769-CEE4917BDF75} = {31B28F7B-070E-40AB-BCAA-E8B9A32EF1A6}
+		{33C3D8F0-297F-4471-92B0-F4E8717F10E3} = {31B28F7B-070E-40AB-BCAA-E8B9A32EF1A6}
+		{47ACDB6F-34CB-478D-9E43-F3662EE5838D} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{670AB88D-85C9-4674-A652-C27488ED73F9} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{4AB3E652-6709-4011-AC2F-C379A0415BAC} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{3D657A5A-C7DF-4817-864F-944755DCE6DF} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{BD938E1D-6FC8-4D46-B103-B4D35761CEA2} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{1C07ECD0-F69E-4E35-9C68-E4063B5D97EC} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{37A36947-2652-4AFD-BCF8-AAFD4D4D2827} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{13BC7AAA-7831-4500-9D28-A93FA4CA3C74} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{135F551E-ACB8-4073-ABB5-A1FA558455DE} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{5532E155-E423-4FFD-B009-80B4281D36BA} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{24220AD7-03ED-427A-BFC8-114C475EAD0F} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{376BB9D1-6C3E-4BB1-B13A-F0750D2BE01F} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{E4157F2E-F11D-48C6-A146-B4D12D9211F7} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{2F25C0DB-E010-4802-8030-C88E2D09D3B0} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{0D7771CB-B3D1-4FF4-A523-40BFD3B12A84} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{42E1BF94-6FE0-4017-9702-55913BD95EDE} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{15AD68F8-6C58-41A3-99B3-558C42A6E7A5} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{28C9D427-83BA-46A6-BEF5-6994A07F2258} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{098CEEE6-91D3-4A7C-A5D5-6BB329BB2B7B} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{465AE1C4-84DD-4864-916A-74D89DC3BBBC} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{D69326FC-CD05-4690-91C0-1537A80ACBFF} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{014EE6B4-BE08-4E50-9EBD-0D7A0CB7A76E} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{DD121F9F-3548-4247-8E10-FB584FC0827C} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{45235656-E284-4682-BE70-9A284FD73243} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{0C6A47C7-7405-4D77-83E1-BC08A88B687B} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{34ECA788-A105-411B-AE8B-17B7CC1D703D} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{30979D28-B876-4F1B-A68A-562989414F8F} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{4C4B6E2E-C9AD-4100-AC3F-3D6C4BBA04F8} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{40F921D6-E86F-4C7B-895D-9B7E96FBC00D} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{FEC2349C-D18C-40B0-BA21-2111E383E972} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{EF1D64A4-6253-460A-B479-73388F98FFF9} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519} = {F384323D-F81E-44FA-A56B-38714905FA81}
+		{C24E4188-27CB-4E00-A5F0-62AE23D536EE} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{020874FC-11A2-4FC7-8929-527462F8819A} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{3411D565-223A-44B5-864C-E30F826001B4} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0C041643-1217-466B-AF2E-1E44C7B117B1} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{6DB8DE55-5419-48EA-B4CD-2880E00409FB} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0A738527-821F-4089-B64E-3C0F4714DC78} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{EA9E6747-867B-4312-94B3-624EEB1C7A7A} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0EEA7382-25A8-4FB0-AE9A-4ECDF2FF6FB7} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{6C6DDBF6-AAF3-4A2A-8CB1-C7A630B7C49F} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0A021166-613C-430C-8460-50F1E0DF7AD8} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{1E3D564C-A79E-4E28-8E13-626EE7780831} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{9C06E60B-2D45-4284-B7C8-7AE6D8194CE0} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{973CE6DA-B55D-4E55-88D5-53BE69D44410} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{8845E6FF-94B2-4994-A8F4-DF30844A2168} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{F3230087-28E2-4ADF-A7D1-D48C5D9CFFE9} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{B729474D-0E96-4296-B317-450EE24F6B48} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{2D4DBF5A-3BF4-4846-89F2-6FCDB80BF295} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{D466E363-F930-4D26-AE55-0256182961DD} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{518D4AE0-FBFF-493A-A2DF-8ACBA842AE19} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{25C5119A-AAFB-4C74-9E12-F747CA4D80E7} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{D975AE29-0CA2-43FC-90A0-B266DF7D4C2A} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{DFF6CFBA-1F4A-4063-AD4C-C11E959DB004} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{4ED9C0A9-C1EF-47ED-99F8-74B7411C971B} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{1E322AE1-E7C1-438B-805E-63436D3DEA7E} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{827FBB8F-C569-4AC7-82FD-9EC2AE3AF7CC} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{94F2567E-9746-4A82-804A-C999D33A286A} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{6A7F6CF5-1085-4F07-AB0E-00F25E407599} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{B41AA17B-5129-41CC-8EA4-250B80BABF87} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{0813853E-8C78-429A-B01A-3FB2EF1898F8} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{C58E2CF3-F8AA-47C1-8A49-65B91252F2AA} = {10235C29-9434-4A37-969D-83F09076D8EC}
+		{5AAA0A78-071A-465C-A98C-CFFAAD013A32} = {10235C29-9434-4A37-969D-83F09076D8EC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4A22EFFF-5422-4D05-9194-C06EADE60E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A22EFFF-5422-4D05-9194-C06EADE60E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A22EFFF-5422-4D05-9194-C06EADE60E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A22EFFF-5422-4D05-9194-C06EADE60E0B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50FED4CD-4338-431A-B058-21255B49A4B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50FED4CD-4338-431A-B058-21255B49A4B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50FED4CD-4338-431A-B058-21255B49A4B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50FED4CD-4338-431A-B058-21255B49A4B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8985343B-73BD-4513-B98A-BC7F4CE63F88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8985343B-73BD-4513-B98A-BC7F4CE63F88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8985343B-73BD-4513-B98A-BC7F4CE63F88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8985343B-73BD-4513-B98A-BC7F4CE63F88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E52FAB8-83A4-4F81-AFED-072BF13D0F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E52FAB8-83A4-4F81-AFED-072BF13D0F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E52FAB8-83A4-4F81-AFED-072BF13D0F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E52FAB8-83A4-4F81-AFED-072BF13D0F46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49ED668A-7FCB-455B-B3B4-26C004172531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49ED668A-7FCB-455B-B3B4-26C004172531}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49ED668A-7FCB-455B-B3B4-26C004172531}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49ED668A-7FCB-455B-B3B4-26C004172531}.Release|Any CPU.Build.0 = Release|Any CPU
-		{602F282E-2829-4C7D-B960-A8D31F326E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{602F282E-2829-4C7D-B960-A8D31F326E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{602F282E-2829-4C7D-B960-A8D31F326E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{602F282E-2829-4C7D-B960-A8D31F326E9F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAD57E10-C310-4BED-A4BF-7B02B1AC35BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAD57E10-C310-4BED-A4BF-7B02B1AC35BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAD57E10-C310-4BED-A4BF-7B02B1AC35BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAD57E10-C310-4BED-A4BF-7B02B1AC35BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0468E166-54DE-4DB7-A2DF-42214A39C392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0468E166-54DE-4DB7-A2DF-42214A39C392}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0468E166-54DE-4DB7-A2DF-42214A39C392}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0468E166-54DE-4DB7-A2DF-42214A39C392}.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
+		{47ACDB6F-34CB-478D-9E43-F3662EE5838D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{C24E4188-27CB-4E00-A5F0-62AE23D536EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDAC3418-1D4E-4216-9371-0A36EA1E13FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{ECA6E734-3908-45B4-9DFA-FDDA49AD620D}.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
+		{0C041643-1217-466B-AF2E-1E44C7B117B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C041643-1217-466B-AF2E-1E44C7B117B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C041643-1217-466B-AF2E-1E44C7B117B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C041643-1217-466B-AF2E-1E44C7B117B1}.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
+		{6DB8DE55-5419-48EA-B4CD-2880E00409FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{EB889E78-AE59-4D41-AC29-8BC4D58BCE16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{24220AD7-03ED-427A-BFC8-114C475EAD0F}.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
+		{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
+		{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
+		{1E3D564C-A79E-4E28-8E13-626EE7780831}.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
+		{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
+		{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
+		{973CE6DA-B55D-4E55-88D5-53BE69D44410}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5CF1FC4-8F56-49BD-BFC2-5AD42AE6302D}.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
+		{2A882DCC-96C1-4EDF-A7F0-B526EC81533F}.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
+		{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
+		{42E1BF94-6FE0-4017-9702-55913BD95EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42E1BF94-6FE0-4017-9702-55913BD95EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42E1BF94-6FE0-4017-9702-55913BD95EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42E1BF94-6FE0-4017-9702-55913BD95EDE}.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
+		{8845E6FF-94B2-4994-A8F4-DF30844A2168}.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
+		{99C8FB58-8718-4E76-AEFA-3C42F2F729B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{9ADBD2EE-D390-490C-BBEA-F844FE6F371E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{465AE1C4-84DD-4864-916A-74D89DC3BBBC}.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
+		{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
+		{D69326FC-CD05-4690-91C0-1537A80ACBFF}.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
+		{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
+		{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
+		{0AEAD15B-CD38-4462-A36C-655ED8D0CBD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD121F9F-3548-4247-8E10-FB584FC0827C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{45235656-E284-4682-BE70-9A284FD73243}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45235656-E284-4682-BE70-9A284FD73243}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45235656-E284-4682-BE70-9A284FD73243}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45235656-E284-4682-BE70-9A284FD73243}.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
+		{0C6A47C7-7405-4D77-83E1-BC08A88B687B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C6A47C7-7405-4D77-83E1-BC08A88B687B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C6A47C7-7405-4D77-83E1-BC08A88B687B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C6A47C7-7405-4D77-83E1-BC08A88B687B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFF6CFBA-1F4A-4063-AD4C-C11E959DB004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFF6CFBA-1F4A-4063-AD4C-C11E959DB004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFF6CFBA-1F4A-4063-AD4C-C11E959DB004}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFF6CFBA-1F4A-4063-AD4C-C11E959DB004}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BC9E4F4-5C34-4B90-80AB-2933992D99A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{34ECA788-A105-411B-AE8B-17B7CC1D703D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB6CB1A4-1D66-49B8-9914-BA12B47C909F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30979D28-B876-4F1B-A68A-562989414F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30979D28-B876-4F1B-A68A-562989414F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30979D28-B876-4F1B-A68A-562989414F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30979D28-B876-4F1B-A68A-562989414F8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E322AE1-E7C1-438B-805E-63436D3DEA7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E322AE1-E7C1-438B-805E-63436D3DEA7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E322AE1-E7C1-438B-805E-63436D3DEA7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E322AE1-E7C1-438B-805E-63436D3DEA7E}.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
+		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9EFBE7D-6AE1-4F05-B9C5-2586835ADC4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40F921D6-E86F-4C7B-895D-9B7E96FBC00D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40F921D6-E86F-4C7B-895D-9B7E96FBC00D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40F921D6-E86F-4C7B-895D-9B7E96FBC00D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40F921D6-E86F-4C7B-895D-9B7E96FBC00D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{827FBB8F-C569-4AC7-82FD-9EC2AE3AF7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{827FBB8F-C569-4AC7-82FD-9EC2AE3AF7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{827FBB8F-C569-4AC7-82FD-9EC2AE3AF7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{827FBB8F-C569-4AC7-82FD-9EC2AE3AF7CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEC2349C-D18C-40B0-BA21-2111E383E972}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEC2349C-D18C-40B0-BA21-2111E383E972}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEC2349C-D18C-40B0-BA21-2111E383E972}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEC2349C-D18C-40B0-BA21-2111E383E972}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94F2567E-9746-4A82-804A-C999D33A286A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94F2567E-9746-4A82-804A-C999D33A286A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94F2567E-9746-4A82-804A-C999D33A286A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94F2567E-9746-4A82-804A-C999D33A286A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF1D64A4-6253-460A-B479-73388F98FFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF1D64A4-6253-460A-B479-73388F98FFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF1D64A4-6253-460A-B479-73388F98FFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF1D64A4-6253-460A-B479-73388F98FFF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A7F6CF5-1085-4F07-AB0E-00F25E407599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A7F6CF5-1085-4F07-AB0E-00F25E407599}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A7F6CF5-1085-4F07-AB0E-00F25E407599}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A7F6CF5-1085-4F07-AB0E-00F25E407599}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B41AA17B-5129-41CC-8EA4-250B80BABF87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C827FFA2-1AE3-47A7-9CF2-F3F56B2D8519}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AAA0A78-071A-465C-A98C-CFFAAD013A32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AAA0A78-071A-465C-A98C-CFFAAD013A32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AAA0A78-071A-465C-A98C-CFFAAD013A32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AAA0A78-071A-465C-A98C-CFFAAD013A32}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4A22EFFF-5422-4D05-9194-C06EADE60E0B} = {23DF8E80-C5C7-4D64-B0D4-F4D33A9646A1}
-		{50FED4CD-4338-431A-B058-21255B49A4B9} = {2BCD92F1-BA65-4145-A650-8BADD26EE5D9}
-		{6FB3A6E1-7322-4CBC-A44E-5993FC2085C1} = {635786A7-1A3B-46BB-9367-DE57F7032900}
-		{8985343B-73BD-4513-B98A-BC7F4CE63F88} = {6FB3A6E1-7322-4CBC-A44E-5993FC2085C1}
-		{EB3CB906-BAB0-4A90-BE2F-BBFE47B036C3} = {635786A7-1A3B-46BB-9367-DE57F7032900}
-		{FE4AAEDA-1D08-4C9A-B61C-8A7156000E43} = {635786A7-1A3B-46BB-9367-DE57F7032900}
-		{4E52FAB8-83A4-4F81-AFED-072BF13D0F46} = {FE4AAEDA-1D08-4C9A-B61C-8A7156000E43}
-		{49ED668A-7FCB-455B-B3B4-26C004172531} = {EB3CB906-BAB0-4A90-BE2F-BBFE47B036C3}
-		{602F282E-2829-4C7D-B960-A8D31F326E9F} = {635786A7-1A3B-46BB-9367-DE57F7032900}
-		{BAD57E10-C310-4BED-A4BF-7B02B1AC35BC} = {23DF8E80-C5C7-4D64-B0D4-F4D33A9646A1}
-		{0468E166-54DE-4DB7-A2DF-42214A39C392} = {2BCD92F1-BA65-4145-A650-8BADD26EE5D9}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {137EEE14-A353-4DA8-98CB-214FD8EBAF33}
+		SolutionGuid = {971198CC-ACB9-4718-9024-42A87E02E503}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
index ab21d6dff380b8..a8ef0f833c4106 100644
--- a/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
+++ b/src/libraries/Microsoft.Extensions.Http/Microsoft.Extensions.Http.sln
@@ -1,55 +1,191 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B51DC955-13A6-41ED-A6C7-DDAB98911513}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DE515C8F-654E-4434-8F3F-014ECD86369D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0517D0EB-1ED7-420A-A7D7-9A167C102ED2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{7110AF00-8902-4693-8697-64B89F6ADFEB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9DE482AA-076A-4EB1-821F-EE2A4A230B4A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{8E552A7E-0C8C-49C2-8988-19469A732E26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http", "ref\Microsoft.Extensions.Http.csproj", "{183E40F1-33A4-461D-AADF-4CF59FB93CCA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{35FEC7D0-BA1A-49B3-B183-309CC182E60B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http", "src\Microsoft.Extensions.Http.csproj", "{A50C941B-09D7-4AB4-85AF-D02E6F96885A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{92E18BB1-B630-4B03-9B05-47F31D1BF94A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Tests", "tests\Microsoft.Extensions.Http.Tests\Microsoft.Extensions.Http.Tests.csproj", "{7DADD323-891C-4EA7-8906-6BC4009FA083}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{B792E72A-0513-4359-B754-D0372610DDCE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http", "ref\Microsoft.Extensions.Http.csproj", "{D4D155B6-2A90-4ECD-97F9-A288F7979375}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http", "src\Microsoft.Extensions.Http.csproj", "{1236A517-6B61-4A62-9495-1C945EDA4D12}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Http.Tests", "tests\Microsoft.Extensions.Http.Tests\Microsoft.Extensions.Http.Tests.csproj", "{58A1E42E-5DA1-452A-B39C-A1819171970A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{85615392-9242-4CAF-A0FE-A439FF615462}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{40143A60-7177-4173-90D4-2891584748CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{65079F8F-0653-4474-B105-551A9B6F102B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{BECC7A6E-1438-4EAC-B34B-276DEF463769}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{A12B92C6-071A-4C61-8934-371DBB240873}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{DE012146-4D34-44CC-8701-53C42F2943D2}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{88CA5129-7287-4652-9119-C3EEA75971C1}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1A4A16B7-A970-476B-A54F-23461FFC5B38}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{06FAB5C7-57CC-45F5-B675-FC7C5C256014}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{04B2029E-33BE-43AF-AF1D-AB8B81A8A833}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{60A324C1-717E-40D5-8E84-A63C506461CC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{817C94A2-D8C6-493D-AC04-07875EA5FAD2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{DE515C8F-654E-4434-8F3F-014ECD86369D} = {04B2029E-33BE-43AF-AF1D-AB8B81A8A833}
+		{58A1E42E-5DA1-452A-B39C-A1819171970A} = {04B2029E-33BE-43AF-AF1D-AB8B81A8A833}
+		{7110AF00-8902-4693-8697-64B89F6ADFEB} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{35FEC7D0-BA1A-49B3-B183-309CC182E60B} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{D4D155B6-2A90-4ECD-97F9-A288F7979375} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{85615392-9242-4CAF-A0FE-A439FF615462} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{40143A60-7177-4173-90D4-2891584748CA} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{BECC7A6E-1438-4EAC-B34B-276DEF463769} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{DE012146-4D34-44CC-8701-53C42F2943D2} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{88CA5129-7287-4652-9119-C3EEA75971C1} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{44EE40EE-2AD9-45D9-A939-A893FA76390C} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{1A4A16B7-A970-476B-A54F-23461FFC5B38} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{06FAB5C7-57CC-45F5-B675-FC7C5C256014} = {60A324C1-717E-40D5-8E84-A63C506461CC}
+		{8E552A7E-0C8C-49C2-8988-19469A732E26} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{B792E72A-0513-4359-B754-D0372610DDCE} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{1236A517-6B61-4A62-9495-1C945EDA4D12} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{65079F8F-0653-4474-B105-551A9B6F102B} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{A12B92C6-071A-4C61-8934-371DBB240873} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{68B501BC-5281-4BC8-B631-C34013E4505E} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+		{E3660206-4E55-4A6A-AF4A-17EAB1BEDF50} = {817C94A2-D8C6-493D-AC04-07875EA5FAD2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{183E40F1-33A4-461D-AADF-4CF59FB93CCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{183E40F1-33A4-461D-AADF-4CF59FB93CCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{183E40F1-33A4-461D-AADF-4CF59FB93CCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{183E40F1-33A4-461D-AADF-4CF59FB93CCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A50C941B-09D7-4AB4-85AF-D02E6F96885A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A50C941B-09D7-4AB4-85AF-D02E6F96885A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A50C941B-09D7-4AB4-85AF-D02E6F96885A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A50C941B-09D7-4AB4-85AF-D02E6F96885A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{92E18BB1-B630-4B03-9B05-47F31D1BF94A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92E18BB1-B630-4B03-9B05-47F31D1BF94A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92E18BB1-B630-4B03-9B05-47F31D1BF94A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92E18BB1-B630-4B03-9B05-47F31D1BF94A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DADD323-891C-4EA7-8906-6BC4009FA083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DADD323-891C-4EA7-8906-6BC4009FA083}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DADD323-891C-4EA7-8906-6BC4009FA083}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DADD323-891C-4EA7-8906-6BC4009FA083}.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
+		{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
+		{7110AF00-8902-4693-8697-64B89F6ADFEB}.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
+		{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
+		{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
+		{A0EBE0C7-F63B-477C-BDE5-6B57AB9DB540}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E004A4D8-CDC5-40F7-A6CD-94DA232F6B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{D4D155B6-2A90-4ECD-97F9-A288F7979375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4D155B6-2A90-4ECD-97F9-A288F7979375}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4D155B6-2A90-4ECD-97F9-A288F7979375}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4D155B6-2A90-4ECD-97F9-A288F7979375}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1236A517-6B61-4A62-9495-1C945EDA4D12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{58A1E42E-5DA1-452A-B39C-A1819171970A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58A1E42E-5DA1-452A-B39C-A1819171970A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58A1E42E-5DA1-452A-B39C-A1819171970A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58A1E42E-5DA1-452A-B39C-A1819171970A}.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
+		{85615392-9242-4CAF-A0FE-A439FF615462}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAFF07C7-1F5F-4706-B7D7-9D5D309CBFE2}.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
+		{65079F8F-0653-4474-B105-551A9B6F102B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65079F8F-0653-4474-B105-551A9B6F102B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65079F8F-0653-4474-B105-551A9B6F102B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65079F8F-0653-4474-B105-551A9B6F102B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BECC7A6E-1438-4EAC-B34B-276DEF463769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{A12B92C6-071A-4C61-8934-371DBB240873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{68B501BC-5281-4BC8-B631-C34013E4505E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{88CA5129-7287-4652-9119-C3EEA75971C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88CA5129-7287-4652-9119-C3EEA75971C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88CA5129-7287-4652-9119-C3EEA75971C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88CA5129-7287-4652-9119-C3EEA75971C1}.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
+		{1A02FCFD-12D4-4F46-8AD4-8C052E7BF0F8}.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
+		{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
+		{1A4A16B7-A970-476B-A54F-23461FFC5B38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A4A16B7-A970-476B-A54F-23461FFC5B38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A4A16B7-A970-476B-A54F-23461FFC5B38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A4A16B7-A970-476B-A54F-23461FFC5B38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06FAB5C7-57CC-45F5-B675-FC7C5C256014}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06FAB5C7-57CC-45F5-B675-FC7C5C256014}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06FAB5C7-57CC-45F5-B675-FC7C5C256014}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06FAB5C7-57CC-45F5-B675-FC7C5C256014}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{183E40F1-33A4-461D-AADF-4CF59FB93CCA} = {B51DC955-13A6-41ED-A6C7-DDAB98911513}
-		{A50C941B-09D7-4AB4-85AF-D02E6F96885A} = {0517D0EB-1ED7-420A-A7D7-9A167C102ED2}
-		{92E18BB1-B630-4B03-9B05-47F31D1BF94A} = {9DE482AA-076A-4EB1-821F-EE2A4A230B4A}
-		{7DADD323-891C-4EA7-8906-6BC4009FA083} = {9DE482AA-076A-4EB1-821F-EE2A4A230B4A}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F300086C-E02A-417C-8659-59AA5139E68A}
+		SolutionGuid = {02FCA09C-178B-4DE0-98E0-BCCDEBA97903}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
index b9be9c02d513f0..9f7305a2feee5f 100644
--- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
+++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/Microsoft.Extensions.Logging.Abstractions.sln
@@ -1,39 +1,35 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4F0BFA72-3D51-4A89-B8CB-121D867664F4}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{7F536552-0E2A-4642-B7CF-863727C2F9CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C721B0D-E0F7-46B1-911B-170BFC0D56B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "src\Microsoft.Extensions.Logging.Abstractions.csproj", "{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{2AF3A1AF-69F1-439D-8427-15F59E4A2FA0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4104D1B0-7B6B-4CE5-97EF-528A5066414D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "src\Microsoft.Extensions.Logging.Abstractions.csproj", "{C9F985F5-E1DB-43CD-956F-C0307E46D853}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{50551F84-7929-4F93-9082-B4AE3EDA6B42}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7F536552-0E2A-4642-B7CF-863727C2F9CD} = {4104D1B0-7B6B-4CE5-97EF-528A5066414D}
+		{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE} = {50551F84-7929-4F93-9082-B4AE3EDA6B42}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2AF3A1AF-69F1-439D-8427-15F59E4A2FA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AF3A1AF-69F1-439D-8427-15F59E4A2FA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AF3A1AF-69F1-439D-8427-15F59E4A2FA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AF3A1AF-69F1-439D-8427-15F59E4A2FA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C9F985F5-E1DB-43CD-956F-C0307E46D853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9F985F5-E1DB-43CD-956F-C0307E46D853}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9F985F5-E1DB-43CD-956F-C0307E46D853}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9F985F5-E1DB-43CD-956F-C0307E46D853}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F536552-0E2A-4642-B7CF-863727C2F9CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F536552-0E2A-4642-B7CF-863727C2F9CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F536552-0E2A-4642-B7CF-863727C2F9CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F536552-0E2A-4642-B7CF-863727C2F9CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75C579F7-F20B-41F1-8CAF-641DE7ADA4EE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2AF3A1AF-69F1-439D-8427-15F59E4A2FA0} = {4F0BFA72-3D51-4A89-B8CB-121D867664F4}
-		{C9F985F5-E1DB-43CD-956F-C0307E46D853} = {2C721B0D-E0F7-46B1-911B-170BFC0D56B3}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0EB01B8F-46D5-4B2E-B3E7-25F1D2D6D62D}
+		SolutionGuid = {450DA749-CBDC-4BDC-950F-8A491CF59D49}
 	EndGlobalSection
 EndGlobal
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 aa501df6051bbc..e9db604514ed27 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
@@ -1,39 +1,210 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BBEAECE0-0015-4048-9781-D8833A961DD7}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{5C771533-F8F4-47A0-9E3C-614F87A72744}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E07E3F9-36C0-4367-94CF-CF1F8FDB2523}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{CD09F265-2818-40E4-8732-C41DE48A4EF7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "ref\Microsoft.Extensions.Logging.Configuration.csproj", "{EFF8FFA2-FF9A-49F5-84D7-5B367EFC77D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "src\Microsoft.Extensions.Logging.Configuration.csproj", "{AECBB8DB-22C3-45D1-95DF-DC4A7377D85D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{1717DDEF-8917-4382-B5DC-073B2F2F4361}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{02F90254-A566-440D-9B98-A31A8A1A4D5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{20D72006-BAEF-4604-A9DC-2864FED9DF9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{71755B81-EF5C-4C36-A278-60D69ECCC158}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D9979978-4230-427D-88F6-455F1D59FE96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{36176FF1-8C33-494D-A496-1D7E0DCFCD86}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{788150B7-B822-4466-A1DC-C875449DE449}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{E7035B72-0180-437E-A696-1F0CD8921279}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "ref\Microsoft.Extensions.Logging.Configuration.csproj", "{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "src\Microsoft.Extensions.Logging.Configuration.csproj", "{B3829B05-AA4A-4A0D-B076-D0C3031C9D33}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{91D63569-CA51-4362-B4FC-9BD66302373F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{BBCC241D-0980-4735-8187-229D37ADC0E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{D482622B-7B40-4311-977F-11C09B98BA4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{4467B594-D9A5-432C-A1CC-07F9C9CED010}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{93C7964F-6A2F-48C7-A3EA-322401532E8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{5645B3B9-A523-4C61-8417-4EE0C90380AB}"
+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\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", "{CCE34638-0797-4E01-A39A-E8C79681D52D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5C771533-F8F4-47A0-9E3C-614F87A72744} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{CC5ACC22-9AD1-49DF-8F84-64AF0D71006C} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{02F90254-A566-440D-9B98-A31A8A1A4D5B} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{20D72006-BAEF-4604-A9DC-2864FED9DF9A} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{D9979978-4230-427D-88F6-455F1D59FE96} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{C7CD6C8B-ACAA-489C-9FD2-6F44DF62EA33} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{C4F75024-EA9D-46C5-B2D9-CAE8FC5EFF38} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{91D63569-CA51-4362-B4FC-9BD66302373F} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{D482622B-7B40-4311-977F-11C09B98BA4F} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{8B2D67D3-9D41-45F0-9CDB-EFC9944C98AA} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{5645B3B9-A523-4C61-8417-4EE0C90380AB} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5} = {CCE34638-0797-4E01-A39A-E8C79681D52D}
+		{CD09F265-2818-40E4-8732-C41DE48A4EF7} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{1717DDEF-8917-4382-B5DC-073B2F2F4361} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{1C7B2B47-D3C6-4B9E-B9B5-0B222ACD9097} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{71755B81-EF5C-4C36-A278-60D69ECCC158} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{36176FF1-8C33-494D-A496-1D7E0DCFCD86} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{788150B7-B822-4466-A1DC-C875449DE449} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{E7035B72-0180-437E-A696-1F0CD8921279} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{BBCC241D-0980-4735-8187-229D37ADC0E5} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{4467B594-D9A5-432C-A1CC-07F9C9CED010} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{93C7964F-6A2F-48C7-A3EA-322401532E8C} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{531F1DAF-B4DE-4240-B7BE-E206330E3792} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{B077F55F-E15A-4B91-A1EB-8178B8313908} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+		{907BD280-43B8-41A1-A306-8B903993DCE4} = {C4ADC43B-84E9-4BB0-8ED0-22ED2E1EB967}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EFF8FFA2-FF9A-49F5-84D7-5B367EFC77D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFF8FFA2-FF9A-49F5-84D7-5B367EFC77D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFF8FFA2-FF9A-49F5-84D7-5B367EFC77D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFF8FFA2-FF9A-49F5-84D7-5B367EFC77D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AECBB8DB-22C3-45D1-95DF-DC4A7377D85D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AECBB8DB-22C3-45D1-95DF-DC4A7377D85D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AECBB8DB-22C3-45D1-95DF-DC4A7377D85D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AECBB8DB-22C3-45D1-95DF-DC4A7377D85D}.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
+		{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
+		{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
+		{1717DDEF-8917-4382-B5DC-073B2F2F4361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{D9979978-4230-427D-88F6-455F1D59FE96}.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
+		{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
+		{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
+		{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
+		{E7035B72-0180-437E-A696-1F0CD8921279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E3D96C3-D5AC-47E0-A3C5-1FF26E0A8780}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3829B05-AA4A-4A0D-B076-D0C3031C9D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{BBCC241D-0980-4735-8187-229D37ADC0E5}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{3CFBDC1C-B621-4921-9AEF-3891B2B644C5}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EFF8FFA2-FF9A-49F5-84D7-5B367EFC77D3} = {BBEAECE0-0015-4048-9781-D8833A961DD7}
-		{AECBB8DB-22C3-45D1-95DF-DC4A7377D85D} = {2E07E3F9-36C0-4367-94CF-CF1F8FDB2523}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6878BDEB-B00F-44C9-87D2-DB01C89597D1}
+		SolutionGuid = {E5154479-615B-4978-AE5A-A7DE55907E36}
 	EndGlobalSection
 EndGlobal
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 24a098f8e6b3c7..d92081d2b5bc9d 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
@@ -1,48 +1,275 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A12B6049-11A7-4E2B-857B-620B917B4A46}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B60701F7-43B3-4A85-B808-5FF9C1865898}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A1F1D16A-5787-45E5-AF85-617702C216C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{60720C98-E619-40A6-9536-BC47AD0A056A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "ref\Microsoft.Extensions.Logging.Console.csproj", "{6D191D5A-572C-4BFA-B73B-C24AF80E8016}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "src\Microsoft.Extensions.Logging.Console.csproj", "{CDEDF61A-4D74-4EAA-B31E-AF5CAAA7B974}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{56A299FB-3733-4AF5-AE10-66AB73D6FC13}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{ED51A791-65BB-4F8B-B76C-769D0663D4A7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console.Tests", "tests\Microsoft.Extensions.Logging.Console.Tests\Microsoft.Extensions.Logging.Console.Tests.csproj", "{A2CFB82A-F553-44CD-8765-97409380EED9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{2299110F-60C7-4812-A15B-B74A14FFBFA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{EF05AB17-527F-40BC-B4D1-AAE510267F4E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{4840FDAC-4B45-4F52-99B9-CC5727CB06D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{1F272F82-E9D1-454A-8E3C-6BEAF02219D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{66A0FD4D-535B-4A59-B39F-8BFAE35072BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{6A02D298-6899-4DD0-BFF4-40702BC30BCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "..\Microsoft.Extensions.Logging.Configuration\ref\Microsoft.Extensions.Logging.Configuration.csproj", "{1B33EC41-F711-4111-8818-FEEBC9A0BD8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "..\Microsoft.Extensions.Logging.Configuration\src\Microsoft.Extensions.Logging.Configuration.csproj", "{E09FB553-28C4-4C1C-8E86-CFAB3374A656}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "ref\Microsoft.Extensions.Logging.Console.csproj", "{87E4E376-68A8-4867-9E83-CBD16D8B99B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "src\Microsoft.Extensions.Logging.Console.csproj", "{974792E2-0311-446A-BABF-18B3A8DDDEC5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console.Tests", "tests\Microsoft.Extensions.Logging.Console.Tests\Microsoft.Extensions.Logging.Console.Tests.csproj", "{6A1C4B05-982A-4BD9-957F-E77992C54EBA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{D62C0D69-0322-4621-8D9E-AF4D30D6BD22}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{27525A8A-61B3-4FDB-B096-36E977A6BE0F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{8AA8114D-BC87-45E3-8C6D-1618C48D5741}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{D3E483FC-DF73-4CD8-AFAA-1DA752F49304}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{AC6EFD37-CF1C-4893-B2BA-41826794F711}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{6316940A-1032-4A41-8D2E-4A9E08B612F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{D1A26695-26BD-45CE-BB18-F5CC75801992}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{88B25E7E-3FF5-41C2-AAE8-BBADB8FA8446}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{09219B29-EEE6-4B14-B474-C014C0047E99}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{14D45314-A07C-4F62-80BD-C44A9D270636}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{03B2FE3F-A8E5-4486-B47B-816A95EF7372}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A0F9E582-8B29-4F77-9B86-51795BE1DAF2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41050E05-8EAF-455A-B310-F2DBA39E8C6D}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B60701F7-43B3-4A85-B808-5FF9C1865898} = {03B2FE3F-A8E5-4486-B47B-816A95EF7372}
+		{6A1C4B05-982A-4BD9-957F-E77992C54EBA} = {03B2FE3F-A8E5-4486-B47B-816A95EF7372}
+		{60720C98-E619-40A6-9536-BC47AD0A056A} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{EEA45BA9-D38F-41CD-BE5E-9283FBFC27D3} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{2299110F-60C7-4812-A15B-B74A14FFBFA7} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{4840FDAC-4B45-4F52-99B9-CC5727CB06D3} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{66A0FD4D-535B-4A59-B39F-8BFAE35072BC} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{87E4E376-68A8-4867-9E83-CBD16D8B99B7} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{D62C0D69-0322-4621-8D9E-AF4D30D6BD22} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{8AA8114D-BC87-45E3-8C6D-1618C48D5741} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{AC6EFD37-CF1C-4893-B2BA-41826794F711} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{D1A26695-26BD-45CE-BB18-F5CC75801992} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{88B25E7E-3FF5-41C2-AAE8-BBADB8FA8446} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{0FB1C55D-62A0-4537-93F8-294761B37CFB} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{09219B29-EEE6-4B14-B474-C014C0047E99} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{14D45314-A07C-4F62-80BD-C44A9D270636} = {A0F9E582-8B29-4F77-9B86-51795BE1DAF2}
+		{0A49D42B-0C4D-46E0-ABBC-AE8600CDC472} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{ED51A791-65BB-4F8B-B76C-769D0663D4A7} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{F3F1AF4B-963B-4DCC-80AF-11DFEB652D8D} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{EF05AB17-527F-40BC-B4D1-AAE510267F4E} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{1F272F82-E9D1-454A-8E3C-6BEAF02219D4} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{2E4D0EB0-E34B-4D47-A7F1-E35C696066E8} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{6A02D298-6899-4DD0-BFF4-40702BC30BCD} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{E09FB553-28C4-4C1C-8E86-CFAB3374A656} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{974792E2-0311-446A-BABF-18B3A8DDDEC5} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{27525A8A-61B3-4FDB-B096-36E977A6BE0F} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{6316940A-1032-4A41-8D2E-4A9E08B612F6} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{3C9A4019-6151-4D27-BCA5-3EBAA0C71B39} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{5DCD1587-CC45-4105-8FFE-E4A43C60DA8D} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{EB05EC17-2C21-47EC-A39D-90ABBA053318} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+		{C9F3D8F9-8646-432E-82FC-2E4E8411CFFE} = {41050E05-8EAF-455A-B310-F2DBA39E8C6D}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6D191D5A-572C-4BFA-B73B-C24AF80E8016}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D191D5A-572C-4BFA-B73B-C24AF80E8016}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D191D5A-572C-4BFA-B73B-C24AF80E8016}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D191D5A-572C-4BFA-B73B-C24AF80E8016}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDEDF61A-4D74-4EAA-B31E-AF5CAAA7B974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDEDF61A-4D74-4EAA-B31E-AF5CAAA7B974}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDEDF61A-4D74-4EAA-B31E-AF5CAAA7B974}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDEDF61A-4D74-4EAA-B31E-AF5CAAA7B974}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2CFB82A-F553-44CD-8765-97409380EED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2CFB82A-F553-44CD-8765-97409380EED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2CFB82A-F553-44CD-8765-97409380EED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2CFB82A-F553-44CD-8765-97409380EED9}.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
+		{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
+		{60720C98-E619-40A6-9536-BC47AD0A056A}.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
+		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3F1A3F6-86BC-4F38-B603-31BBA0A022B7}.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
+		{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
+		{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
+		{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
+		{2299110F-60C7-4812-A15B-B74A14FFBFA7}.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
+		{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
+		{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
+		{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
+		{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
+		{9BCECFDA-BF6E-4BD8-BFE2-A25C61F57874}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{1B33EC41-F711-4111-8818-FEEBC9A0BD8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{87E4E376-68A8-4867-9E83-CBD16D8B99B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87E4E376-68A8-4867-9E83-CBD16D8B99B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87E4E376-68A8-4867-9E83-CBD16D8B99B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87E4E376-68A8-4867-9E83-CBD16D8B99B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{974792E2-0311-446A-BABF-18B3A8DDDEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{974792E2-0311-446A-BABF-18B3A8DDDEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{974792E2-0311-446A-BABF-18B3A8DDDEC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{974792E2-0311-446A-BABF-18B3A8DDDEC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A1C4B05-982A-4BD9-957F-E77992C54EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A1C4B05-982A-4BD9-957F-E77992C54EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A1C4B05-982A-4BD9-957F-E77992C54EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A1C4B05-982A-4BD9-957F-E77992C54EBA}.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
+		{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
+		{8AA8114D-BC87-45E3-8C6D-1618C48D5741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{D3E483FC-DF73-4CD8-AFAA-1DA752F49304}.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
+		{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
+		{D1A26695-26BD-45CE-BB18-F5CC75801992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{88B25E7E-3FF5-41C2-AAE8-BBADB8FA8446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88B25E7E-3FF5-41C2-AAE8-BBADB8FA8446}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88B25E7E-3FF5-41C2-AAE8-BBADB8FA8446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88B25E7E-3FF5-41C2-AAE8-BBADB8FA8446}.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
+		{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
+		{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
+		{09219B29-EEE6-4B14-B474-C014C0047E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09219B29-EEE6-4B14-B474-C014C0047E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09219B29-EEE6-4B14-B474-C014C0047E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09219B29-EEE6-4B14-B474-C014C0047E99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14D45314-A07C-4F62-80BD-C44A9D270636}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14D45314-A07C-4F62-80BD-C44A9D270636}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14D45314-A07C-4F62-80BD-C44A9D270636}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14D45314-A07C-4F62-80BD-C44A9D270636}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF5E5B5A-AC50-4FF1-AADB-0DFC1AA8E429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6D191D5A-572C-4BFA-B73B-C24AF80E8016} = {A12B6049-11A7-4E2B-857B-620B917B4A46}
-		{CDEDF61A-4D74-4EAA-B31E-AF5CAAA7B974} = {A1F1D16A-5787-45E5-AF85-617702C216C6}
-		{A2CFB82A-F553-44CD-8765-97409380EED9} = {56A299FB-3733-4AF5-AE10-66AB73D6FC13}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E75E4D9D-8919-409F-8FF1-67DD9C346EA7}
+		SolutionGuid = {C1591684-381C-4761-A20A-4B7FA24E5557}
 	EndGlobalSection
 EndGlobal
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 8de47f7c600c5a..a8d1f8bcebf90c 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
@@ -1,39 +1,154 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3B9F38A7-3FCA-4C21-8435-9B6658F6B339}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{E3D3AF4B-1494-4272-8B7F-23385704E49A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{378A459F-A677-4FC6-B8B4-6858044FD56D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{544BBE63-3650-42E0-AD83-B613907BE753}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "ref\Microsoft.Extensions.Logging.Debug.csproj", "{467F595B-D8C7-419D-9D8A-46424481D895}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "src\Microsoft.Extensions.Logging.Debug.csproj", "{4649154D-6F09-4A6B-AB25-6FDB2A847BC2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{BB19DE2F-5A32-4769-8CB5-80E59C500229}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{850FBE78-DE29-480D-B4EE-6D260B0341B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{16E075F3-372C-4A98-BDAF-FF615B8A9855}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{3DDCFBB7-A438-46BB-9094-A1A39060DD2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "ref\Microsoft.Extensions.Logging.Debug.csproj", "{7EAFD932-A183-488B-8688-531568CEE5B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "src\Microsoft.Extensions.Logging.Debug.csproj", "{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{7DC15EBB-2614-473D-9B46-D764F8E1613C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{7B89700F-897A-4CE8-B789-C9F915631845}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{B39EB467-7C81-482C-A1EA-D6B183E43DE9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{6BDC5518-F6BA-4506-B9E6-505EDEEE340F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{AD197619-E574-41FD-A70F-FDE7C750E6DF}"
+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\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", "{976505DE-70B0-464C-8D38-954C6C70085E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAFB0E3C-1706-4268-8798-8FDF97CF0966}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E3D3AF4B-1494-4272-8B7F-23385704E49A} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{47DEB52C-BDB2-4B4F-9CE0-D5D75D16BED4} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{BB19DE2F-5A32-4769-8CB5-80E59C500229} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{16E075F3-372C-4A98-BDAF-FF615B8A9855} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{7EAFD932-A183-488B-8688-531568CEE5B2} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{7DC15EBB-2614-473D-9B46-D764F8E1613C} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{B39EB467-7C81-482C-A1EA-D6B183E43DE9} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{AD197619-E574-41FD-A70F-FDE7C750E6DF} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{C839B756-1681-4DFD-A73E-9EFB91C3495D} = {976505DE-70B0-464C-8D38-954C6C70085E}
+		{544BBE63-3650-42E0-AD83-B613907BE753} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{5B4734D0-7CF9-4F4B-B27A-FAED72A81C71} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{850FBE78-DE29-480D-B4EE-6D260B0341B4} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{3DDCFBB7-A438-46BB-9094-A1A39060DD2A} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{7B89700F-897A-4CE8-B789-C9F915631845} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{6BDC5518-F6BA-4506-B9E6-505EDEEE340F} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{A3AE4326-5EB6-454C-8276-93B1E5FA5A84} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790} = {DAFB0E3C-1706-4268-8798-8FDF97CF0966}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{467F595B-D8C7-419D-9D8A-46424481D895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{467F595B-D8C7-419D-9D8A-46424481D895}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{467F595B-D8C7-419D-9D8A-46424481D895}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{467F595B-D8C7-419D-9D8A-46424481D895}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4649154D-6F09-4A6B-AB25-6FDB2A847BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4649154D-6F09-4A6B-AB25-6FDB2A847BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4649154D-6F09-4A6B-AB25-6FDB2A847BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4649154D-6F09-4A6B-AB25-6FDB2A847BC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3D3AF4B-1494-4272-8B7F-23385704E49A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3D3AF4B-1494-4272-8B7F-23385704E49A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3D3AF4B-1494-4272-8B7F-23385704E49A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3D3AF4B-1494-4272-8B7F-23385704E49A}.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
+		{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
+		{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
+		{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
+		{BB19DE2F-5A32-4769-8CB5-80E59C500229}.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
+		{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
+		{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
+		{7EAFD932-A183-488B-8688-531568CEE5B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EAFD932-A183-488B-8688-531568CEE5B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EAFD932-A183-488B-8688-531568CEE5B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EAFD932-A183-488B-8688-531568CEE5B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81AB6F03-2FF8-4F0F-AB21-B80A6C345DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{AD197619-E574-41FD-A70F-FDE7C750E6DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DACACFDC-C2ED-41A9-B2D4-2898FC4A938F}.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
+		{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
+		{C839B756-1681-4DFD-A73E-9EFB91C3495D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{668A1DC6-089D-4ABA-A32B-E1F85EAD1790}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{467F595B-D8C7-419D-9D8A-46424481D895} = {3B9F38A7-3FCA-4C21-8435-9B6658F6B339}
-		{4649154D-6F09-4A6B-AB25-6FDB2A847BC2} = {378A459F-A677-4FC6-B8B4-6858044FD56D}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {EA350A46-7E04-4924-9367-9294ECEB0341}
+		SolutionGuid = {4842DEC4-687D-48D9-B1FE-FF5456C0B60B}
 	EndGlobalSection
 EndGlobal
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 4386d2758061aa..b262048e342a39 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
@@ -1,39 +1,259 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EBB90F30-FF27-4FE2-A893-AFF3A8A6EA1C}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{136EBD1F-008D-4050-A9BB-23B5F71B2BC9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{B67E21A5-9B87-46DB-99A1-F04074CBE466}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "ref\Microsoft.Extensions.Logging.EventLog.csproj", "{1F096CC9-6700-47BD-9468-0093880C1EBA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{F61FEA80-03CF-4F04-8362-EA64E3E27C58}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "src\Microsoft.Extensions.Logging.EventLog.csproj", "{B31BB7CC-C769-43BF-9C0B-38F8002E8E1E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A21DEE4B-F49B-4A19-95AC-7589757B8962}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{E74341EE-52F2-4649-AB89-5CB3C7D6415F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{62D0B220-DABD-4C56-A0E2-640D74465328}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{B1BE2665-7E3F-46FB-BCE1-774D5984F76C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "ref\Microsoft.Extensions.Logging.EventLog.csproj", "{738E67B2-2339-4A33-AE35-27D426CFF6DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "src\Microsoft.Extensions.Logging.EventLog.csproj", "{5EA9057E-5887-4BDB-8785-A752D96D89F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{71AF748C-E5FD-46C7-9B6E-0643782CE5E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{515F097D-9FFB-4728-8B9E-18CFA6916AD3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{D41F65C3-1D86-44FA-BE07-9E95392E2519}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{85B1195D-CA73-412B-A1DB-66A2ECCFDB60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{BEA7323C-7078-4F94-8AA6-E16C472DAB2C}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{39D5EF56-D677-4F76-A6D6-EBBEC5CCAD8A}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{204919F3-8E5C-4D4D-9E3B-ADFB1E453972}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{E266D70D-9B9E-485D-B739-87E1DD31D11D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{6D536640-48AD-4AA6-A17E-28400260088C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{4E8A208E-92FC-4A1F-BB9A-D12A6BD513FE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{18516F07-CC8B-4009-9822-0AE194B30407}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CB85C76A-3E2A-4D2A-8B90-92CA5722A170}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{850F20FC-2DA4-4DC1-BE6C-2A2476B4DCD8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{A3593227-191A-4113-9018-3B24F799741F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{E7957981-DA36-4F51-9AA5-71F4D64B4BB0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B8E63A1B-9DA8-4D59-B69B-0EB30AB04D43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{8DC023B2-B153-4BC1-9941-1AC124895A13}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{4C910A27-69A1-41EA-ABA1-976AE77DCE42}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{2121E63F-E899-44A4-81B0-E5A427ACB384}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{09CDF30B-DD18-4BA6-BE49-4BD35B225534}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8327A1D5-0383-485D-9430-3E754C4FDDAB}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F15DA9A4-0AB3-4C41-999D-7653B7C5B18F} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{F61FEA80-03CF-4F04-8362-EA64E3E27C58} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{E74341EE-52F2-4649-AB89-5CB3C7D6415F} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{B1BE2665-7E3F-46FB-BCE1-774D5984F76C} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{738E67B2-2339-4A33-AE35-27D426CFF6DC} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{D41F65C3-1D86-44FA-BE07-9E95392E2519} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{3D501DAC-12C1-4423-AE63-7157624B65DB} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{E266D70D-9B9E-485D-B739-87E1DD31D11D} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{6D536640-48AD-4AA6-A17E-28400260088C} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{18516F07-CC8B-4009-9822-0AE194B30407} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{850F20FC-2DA4-4DC1-BE6C-2A2476B4DCD8} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{C56CCBD0-3A09-4DD6-8FF8-F72D47ABDEBB} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{B8E63A1B-9DA8-4D59-B69B-0EB30AB04D43} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{FC75EA09-5D5C-4F63-8686-6ED99F5B503B} = {09CDF30B-DD18-4BA6-BE49-4BD35B225534}
+		{B67E21A5-9B87-46DB-99A1-F04074CBE466} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{A21DEE4B-F49B-4A19-95AC-7589757B8962} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{62D0B220-DABD-4C56-A0E2-640D74465328} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{6C2850C7-56F0-4DCF-BFBF-4365DE2FC439} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{5EA9057E-5887-4BDB-8785-A752D96D89F9} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{515F097D-9FFB-4728-8B9E-18CFA6916AD3} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{85B1195D-CA73-412B-A1DB-66A2ECCFDB60} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{1D99D47C-7A6B-4635-905B-891B3D5AF79B} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{39D5EF56-D677-4F76-A6D6-EBBEC5CCAD8A} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{204919F3-8E5C-4D4D-9E3B-ADFB1E453972} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{4E8A208E-92FC-4A1F-BB9A-D12A6BD513FE} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{CB85C76A-3E2A-4D2A-8B90-92CA5722A170} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{A3593227-191A-4113-9018-3B24F799741F} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{E7957981-DA36-4F51-9AA5-71F4D64B4BB0} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{8DC023B2-B153-4BC1-9941-1AC124895A13} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{4C910A27-69A1-41EA-ABA1-976AE77DCE42} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+		{2121E63F-E899-44A4-81B0-E5A427ACB384} = {8327A1D5-0383-485D-9430-3E754C4FDDAB}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F096CC9-6700-47BD-9468-0093880C1EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F096CC9-6700-47BD-9468-0093880C1EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F096CC9-6700-47BD-9468-0093880C1EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F096CC9-6700-47BD-9468-0093880C1EBA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B31BB7CC-C769-43BF-9C0B-38F8002E8E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B31BB7CC-C769-43BF-9C0B-38F8002E8E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B31BB7CC-C769-43BF-9C0B-38F8002E8E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B31BB7CC-C769-43BF-9C0B-38F8002E8E1E}.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
+		{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
+		{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
+		{F61FEA80-03CF-4F04-8362-EA64E3E27C58}.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
+		{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
+		{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
+		{62D0B220-DABD-4C56-A0E2-640D74465328}.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
+		{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
+		{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
+		{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
+		{71AF748C-E5FD-46C7-9B6E-0643782CE5E1}.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
+		{D41F65C3-1D86-44FA-BE07-9E95392E2519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{BEA7323C-7078-4F94-8AA6-E16C472DAB2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{39D5EF56-D677-4F76-A6D6-EBBEC5CCAD8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39D5EF56-D677-4F76-A6D6-EBBEC5CCAD8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39D5EF56-D677-4F76-A6D6-EBBEC5CCAD8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39D5EF56-D677-4F76-A6D6-EBBEC5CCAD8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD0C10F6-84AA-4B6F-95A6-E723A4DAC6BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{E266D70D-9B9E-485D-B739-87E1DD31D11D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D536640-48AD-4AA6-A17E-28400260088C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D536640-48AD-4AA6-A17E-28400260088C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D536640-48AD-4AA6-A17E-28400260088C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D536640-48AD-4AA6-A17E-28400260088C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E8A208E-92FC-4A1F-BB9A-D12A6BD513FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E8A208E-92FC-4A1F-BB9A-D12A6BD513FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E8A208E-92FC-4A1F-BB9A-D12A6BD513FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E8A208E-92FC-4A1F-BB9A-D12A6BD513FE}.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
+		{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
+		{850F20FC-2DA4-4DC1-BE6C-2A2476B4DCD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{850F20FC-2DA4-4DC1-BE6C-2A2476B4DCD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{850F20FC-2DA4-4DC1-BE6C-2A2476B4DCD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{850F20FC-2DA4-4DC1-BE6C-2A2476B4DCD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3593227-191A-4113-9018-3B24F799741F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3593227-191A-4113-9018-3B24F799741F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3593227-191A-4113-9018-3B24F799741F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3593227-191A-4113-9018-3B24F799741F}.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
+		{E7957981-DA36-4F51-9AA5-71F4D64B4BB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7957981-DA36-4F51-9AA5-71F4D64B4BB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7957981-DA36-4F51-9AA5-71F4D64B4BB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7957981-DA36-4F51-9AA5-71F4D64B4BB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8E63A1B-9DA8-4D59-B69B-0EB30AB04D43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8E63A1B-9DA8-4D59-B69B-0EB30AB04D43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8E63A1B-9DA8-4D59-B69B-0EB30AB04D43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8E63A1B-9DA8-4D59-B69B-0EB30AB04D43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DC023B2-B153-4BC1-9941-1AC124895A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DC023B2-B153-4BC1-9941-1AC124895A13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DC023B2-B153-4BC1-9941-1AC124895A13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DC023B2-B153-4BC1-9941-1AC124895A13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C910A27-69A1-41EA-ABA1-976AE77DCE42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{2121E63F-E899-44A4-81B0-E5A427ACB384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2121E63F-E899-44A4-81B0-E5A427ACB384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2121E63F-E899-44A4-81B0-E5A427ACB384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2121E63F-E899-44A4-81B0-E5A427ACB384}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1F096CC9-6700-47BD-9468-0093880C1EBA} = {EBB90F30-FF27-4FE2-A893-AFF3A8A6EA1C}
-		{B31BB7CC-C769-43BF-9C0B-38F8002E8E1E} = {136EBD1F-008D-4050-A9BB-23B5F71B2BC9}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {ABE9D30E-2F6F-4176-81B3-1DCAF056FE72}
+		SolutionGuid = {88E9AE9C-34A3-4853-8244-9158CC50902D}
 	EndGlobalSection
 EndGlobal
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 619a30db23942d..090c34eefe9320 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
@@ -1,55 +1,205 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DDE5A3F1-C3F4-4BA7-807B-FC6632E38C19}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ABF4371B-507E-4F4C-85D0-2B5EAA12A976}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C612E0EC-DDF8-4D6F-B775-3EE98721D562}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{EF689C53-9B62-4E17-B412-92FAD527FA59}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F476F7BA-2F47-4AAB-AF22-20D8ECBAE2E1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource", "ref\Microsoft.Extensions.Logging.EventSource.csproj", "{57FC3126-1841-4D21-A52E-7C13807DA68B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource", "src\Microsoft.Extensions.Logging.EventSource.csproj", "{D7E3D698-2812-4FF2-98DF-A45C4377E4C4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{AD133460-B832-44BE-BF0A-A699A77FA718}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource.Tests", "tests\Microsoft.Extensions.Logging.EventSource.Tests.csproj", "{F4B45EFE-9DA0-4190-8267-50230E1FF413}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{1CFC41DE-18F8-4993-9B5D-64655D043158}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4CB74585-BCBA-48E4-9532-3D2B343EC9CB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{F5B4A3CF-03B5-40A2-BE78-DA6230270113}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{F4A703F8-3D69-4113-A86F-9AD908086092}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource", "ref\Microsoft.Extensions.Logging.EventSource.csproj", "{39B2002C-CA45-4491-BF24-A683FED4F305}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource", "src\Microsoft.Extensions.Logging.EventSource.csproj", "{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventSource.Tests", "tests\Microsoft.Extensions.Logging.EventSource.Tests.csproj", "{7939B14F-FDE9-468C-8307-8CC1220EBC2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{BB4E6DC3-4F30-4315-884A-243077FE68C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{4B621745-2446-4A51-96C1-E1F9D4FCE1E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{61F1BF49-0040-47CC-BBA9-14E80CECD6CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{B73EC56E-61AB-4857-903D-F5C4BDDD2357}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{C8624F19-AA35-4551-BCB9-CE391692C7B6}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F207A3E6-1434-40B8-9DB9-473D29FEA1E4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{0D52354A-817C-43D5-B693-7D8D231CC77F}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{5A956452-F322-4C4F-8689-D2B425764293}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{68A18B95-6F5E-4893-A786-484FC3D9861E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{31168EFB-F1C4-44F7-A66D-7009EE9B7F77}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{ABF4371B-507E-4F4C-85D0-2B5EAA12A976} = {68A18B95-6F5E-4893-A786-484FC3D9861E}
+		{7939B14F-FDE9-468C-8307-8CC1220EBC2A} = {68A18B95-6F5E-4893-A786-484FC3D9861E}
+		{EF689C53-9B62-4E17-B412-92FAD527FA59} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{1CFC41DE-18F8-4993-9B5D-64655D043158} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{F5B4A3CF-03B5-40A2-BE78-DA6230270113} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{39B2002C-CA45-4491-BF24-A683FED4F305} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{BB4E6DC3-4F30-4315-884A-243077FE68C0} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{B73EC56E-61AB-4857-903D-F5C4BDDD2357} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{C8624F19-AA35-4551-BCB9-CE391692C7B6} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{F207A3E6-1434-40B8-9DB9-473D29FEA1E4} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{0D52354A-817C-43D5-B693-7D8D231CC77F} = {2101ED3B-0EAA-48EF-96AE-66A285B1C6D6}
+		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{AD133460-B832-44BE-BF0A-A699A77FA718} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{F4A703F8-3D69-4113-A86F-9AD908086092} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{E06E4463-281C-46C1-A4D6-4593742C1CBC} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{23F45D4C-4E33-4334-A5BF-D34E24165E0B} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{9A16DEC0-1F88-4335-95B3-D7923FEB5283} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+		{5A956452-F322-4C4F-8689-D2B425764293} = {31168EFB-F1C4-44F7-A66D-7009EE9B7F77}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{57FC3126-1841-4D21-A52E-7C13807DA68B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57FC3126-1841-4D21-A52E-7C13807DA68B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57FC3126-1841-4D21-A52E-7C13807DA68B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57FC3126-1841-4D21-A52E-7C13807DA68B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7E3D698-2812-4FF2-98DF-A45C4377E4C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7E3D698-2812-4FF2-98DF-A45C4377E4C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7E3D698-2812-4FF2-98DF-A45C4377E4C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7E3D698-2812-4FF2-98DF-A45C4377E4C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4B45EFE-9DA0-4190-8267-50230E1FF413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4B45EFE-9DA0-4190-8267-50230E1FF413}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4B45EFE-9DA0-4190-8267-50230E1FF413}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4B45EFE-9DA0-4190-8267-50230E1FF413}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CB74585-BCBA-48E4-9532-3D2B343EC9CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CB74585-BCBA-48E4-9532-3D2B343EC9CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CB74585-BCBA-48E4-9532-3D2B343EC9CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CB74585-BCBA-48E4-9532-3D2B343EC9CB}.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
+		{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
+		{9B5DD499-7FE6-4E35-8084-EAF9D0E4CFDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{A7E8D7C4-D468-486A-A8EA-93F260CD4FE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD133460-B832-44BE-BF0A-A699A77FA718}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{1CFC41DE-18F8-4993-9B5D-64655D043158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CFC41DE-18F8-4993-9B5D-64655D043158}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CFC41DE-18F8-4993-9B5D-64655D043158}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CFC41DE-18F8-4993-9B5D-64655D043158}.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
+		{7834A5FC-A39B-4435-9D8C-2EEABFFA7A84}.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
+		{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
+		{39B2002C-CA45-4491-BF24-A683FED4F305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B2002C-CA45-4491-BF24-A683FED4F305}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B2002C-CA45-4491-BF24-A683FED4F305}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B2002C-CA45-4491-BF24-A683FED4F305}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85D5D364-5D5F-4D9F-A6DA-1EF4C9E5503F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{7939B14F-FDE9-468C-8307-8CC1220EBC2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7939B14F-FDE9-468C-8307-8CC1220EBC2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7939B14F-FDE9-468C-8307-8CC1220EBC2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7939B14F-FDE9-468C-8307-8CC1220EBC2A}.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
+		{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
+		{4B621745-2446-4A51-96C1-E1F9D4FCE1E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61F1BF49-0040-47CC-BBA9-14E80CECD6CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B8BD276-447B-4E93-AC2F-2F5E9E355E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{C8624F19-AA35-4551-BCB9-CE391692C7B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8624F19-AA35-4551-BCB9-CE391692C7B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8624F19-AA35-4551-BCB9-CE391692C7B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8624F19-AA35-4551-BCB9-CE391692C7B6}.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
+		{23F45D4C-4E33-4334-A5BF-D34E24165E0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EAEB159-6569-4D3F-B7E4-313F8EBED61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{9A16DEC0-1F88-4335-95B3-D7923FEB5283}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F207A3E6-1434-40B8-9DB9-473D29FEA1E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F207A3E6-1434-40B8-9DB9-473D29FEA1E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F207A3E6-1434-40B8-9DB9-473D29FEA1E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F207A3E6-1434-40B8-9DB9-473D29FEA1E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D52354A-817C-43D5-B693-7D8D231CC77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D52354A-817C-43D5-B693-7D8D231CC77F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D52354A-817C-43D5-B693-7D8D231CC77F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D52354A-817C-43D5-B693-7D8D231CC77F}.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
+		{50CC33E5-CB2C-4CFB-9CDE-BBD41B30FB86}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{57FC3126-1841-4D21-A52E-7C13807DA68B} = {DDE5A3F1-C3F4-4BA7-807B-FC6632E38C19}
-		{D7E3D698-2812-4FF2-98DF-A45C4377E4C4} = {C612E0EC-DDF8-4D6F-B775-3EE98721D562}
-		{F4B45EFE-9DA0-4190-8267-50230E1FF413} = {F476F7BA-2F47-4AAB-AF22-20D8ECBAE2E1}
-		{4CB74585-BCBA-48E4-9532-3D2B343EC9CB} = {F476F7BA-2F47-4AAB-AF22-20D8ECBAE2E1}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A390B1E5-F45D-479F-B295-661C927B203B}
+		SolutionGuid = {67B715CE-2E67-4605-BFB0-CA65F345C3A5}
 	EndGlobalSection
 EndGlobal
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 11e78ce6edab36..6f8d23c969e9a5 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
@@ -1,39 +1,154 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3441AD43-0D99-4D20-BAD3-E1092FA28C2B}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{D72D9E03-5346-4E9E-9617-45BE57AB95E0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CAC44973-1D67-49D4-9E58-E69AEC83F506}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{1B7B708C-F860-478E-B3D4-1CB70E71A440}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.TraceSource", "ref\Microsoft.Extensions.Logging.TraceSource.csproj", "{AF94E394-D0C7-4352-B72E-40A11D70F73B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.TraceSource", "src\Microsoft.Extensions.Logging.TraceSource.csproj", "{132D9B27-ADE6-4E26-A430-EF34A2A135C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A9250A96-9B27-46C5-A043-11F67D63B128}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{C0F647A3-A299-441F-BE78-67022E0683E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{A64CC82B-B781-4469-B009-49A43A0A2A96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{367922CE-A24E-4977-89BE-D1F2F678F8B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{F63AB9DB-6E62-4FEC-BA06-E146615C08AC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.TraceSource", "ref\Microsoft.Extensions.Logging.TraceSource.csproj", "{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.TraceSource", "src\Microsoft.Extensions.Logging.TraceSource.csproj", "{BC92BF65-8FA0-49C0-911F-426F21090774}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\ref\Microsoft.Extensions.Logging.csproj", "{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "..\Microsoft.Extensions.Logging\src\Microsoft.Extensions.Logging.csproj", "{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{15D8CD42-77C9-4DEC-9C53-E6C6C766A646}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{3F1FF12D-6CAF-409D-BF8D-E299646B545C}"
+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\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", "{DA0453C7-375C-457B-AF9A-D322E33F3F1B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41FF013C-0FEC-4D79-A6CD-0C7BDE613223}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D72D9E03-5346-4E9E-9617-45BE57AB95E0} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{B1D3E68C-EE6F-4A2F-A753-F45D5BC4CF55} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{C0F647A3-A299-441F-BE78-67022E0683E6} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{367922CE-A24E-4977-89BE-D1F2F678F8B2} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{2863DE0C-F23B-4A27-8C59-F42A9B27AFB8} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{EEC70BE6-E9E6-45FB-A24C-8BEAE4E14CE6} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{0BC6E16E-E4E8-4159-9A0B-B92C9D0CFB92} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{3F1FF12D-6CAF-409D-BF8D-E299646B545C} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{5D92F57D-42F4-4B37-907C-25D06233FDBB} = {DA0453C7-375C-457B-AF9A-D322E33F3F1B}
+		{1B7B708C-F860-478E-B3D4-1CB70E71A440} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{A9250A96-9B27-46C5-A043-11F67D63B128} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{A64CC82B-B781-4469-B009-49A43A0A2A96} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{F63AB9DB-6E62-4FEC-BA06-E146615C08AC} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{BC92BF65-8FA0-49C0-911F-426F21090774} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{C0A5172A-162E-4CD8-B4E4-C8AE137EBC64} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{59BC50A1-510F-44A4-A507-AEC051EA8908} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{D72BF608-9C7C-41BE-9288-22BA49AF954F} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+		{9635EB28-5AEA-40A1-B59E-A2C7CA21376F} = {41FF013C-0FEC-4D79-A6CD-0C7BDE613223}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AF94E394-D0C7-4352-B72E-40A11D70F73B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF94E394-D0C7-4352-B72E-40A11D70F73B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF94E394-D0C7-4352-B72E-40A11D70F73B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF94E394-D0C7-4352-B72E-40A11D70F73B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132D9B27-ADE6-4E26-A430-EF34A2A135C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132D9B27-ADE6-4E26-A430-EF34A2A135C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132D9B27-ADE6-4E26-A430-EF34A2A135C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{132D9B27-ADE6-4E26-A430-EF34A2A135C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D72D9E03-5346-4E9E-9617-45BE57AB95E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{C0F647A3-A299-441F-BE78-67022E0683E6}.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
+		{A64CC82B-B781-4469-B009-49A43A0A2A96}.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
+		{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
+		{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
+		{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
+		{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
+		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15D8CD42-77C9-4DEC-9C53-E6C6C766A646}.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
+		{59BC50A1-510F-44A4-A507-AEC051EA8908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{D72BF608-9C7C-41BE-9288-22BA49AF954F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D72BF608-9C7C-41BE-9288-22BA49AF954F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D72BF608-9C7C-41BE-9288-22BA49AF954F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D72BF608-9C7C-41BE-9288-22BA49AF954F}.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
+		{5D92F57D-42F4-4B37-907C-25D06233FDBB}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AF94E394-D0C7-4352-B72E-40A11D70F73B} = {3441AD43-0D99-4D20-BAD3-E1092FA28C2B}
-		{132D9B27-ADE6-4E26-A430-EF34A2A135C3} = {CAC44973-1D67-49D4-9E58-E69AEC83F506}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {64D59B3E-1084-4386-B97B-054437D35FAD}
+		SolutionGuid = {3375EACB-CFC1-4E7B-8A64-C346BD35E354}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
index 77da2e19475718..67300c5da44e73 100644
--- a/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
+++ b/src/libraries/Microsoft.Extensions.Logging/Microsoft.Extensions.Logging.sln
@@ -1,68 +1,485 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{506843F3-0B42-4654-887D-350335DFDE54}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7F66E50D-B9E1-4229-85CE-61BCA70EA568}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9AD546DC-EDBD-46DB-B5E6-880A5DE0E07B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{C4B04D68-8344-41D2-B46C-3BB5F31799EC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{787403B8-4C97-440D-A171-ED3725B2E16A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "ref\Microsoft.Extensions.Logging.csproj", "{77C35C58-003F-46AB-AECC-20E19E99D4B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{9384A49A-C77F-44E1-A18C-E4EE831DE7F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "src\Microsoft.Extensions.Logging.csproj", "{589F92D4-A2DE-4BC4-870E-777F0F768A62}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DI.Common", "DI.Common", "{1F3C5022-ADFF-455C-B1B1-224CC13961DF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{86FE36DC-1F35-4939-8937-18541614EF6D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{70168406-EAF0-47A8-B5C4-12B34686738F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{D698D832-B15A-4C2E-8C6A-D8F97044000A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Tests", "tests\Common\Microsoft.Extensions.Logging.Tests.csproj", "{57A1A1A3-A351-4733-912D-6FF725C269AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\ref\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Testing.Tests", "tests\DI.Common\Common\tests\Microsoft.Extensions.Logging.Testing.Tests.csproj", "{AB968316-DB05-4237-8925-E074E34353E3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "..\Microsoft.Extensions.Configuration.FileExtensions\src\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{AB6345AD-EF69-42DD-BC90-5A7FE394358F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{23079270-3FED-4C99-9F13-637B79150A95}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\ref\Microsoft.Extensions.Configuration.Json.csproj", "{6FDFE85B-20C3-493F-AF29-B39718761A85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "..\Microsoft.Extensions.Configuration.Json\src\Microsoft.Extensions.Configuration.Json.csproj", "{CF5604F2-EDD6-4A63-8E60-E327D91BA532}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{D87888FB-98CD-4A24-AC6D-2AC89322D0F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{4B33E878-3451-4B2E-9AC5-849F77EE02D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{2F7FA324-F7E6-4D71-891F-780B56DD9D3E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{BECB0DC7-4194-4C4F-B821-8C8410303013}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{335D852A-CE30-4038-9AD4-B70B268BB69F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\ref\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{FBD6DA27-FBFB-42AB-A56C-7D0147A15028}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Abstractions", "..\Microsoft.Extensions.FileProviders.Abstractions\src\Microsoft.Extensions.FileProviders.Abstractions.csproj", "{31E317F8-F766-4EC3-8101-2D92CDB407CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\ref\Microsoft.Extensions.FileProviders.Physical.csproj", "{B3A732E4-93F1-4827-8B39-4119DEF3E4E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileProviders.Physical", "..\Microsoft.Extensions.FileProviders.Physical\src\Microsoft.Extensions.FileProviders.Physical.csproj", "{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\ref\Microsoft.Extensions.FileSystemGlobbing.csproj", "{F61AC077-D30A-4F65-9831-5F9DC23B3561}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.FileSystemGlobbing", "..\Microsoft.Extensions.FileSystemGlobbing\src\Microsoft.Extensions.FileSystemGlobbing.csproj", "{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\ref\Microsoft.Extensions.Logging.Abstractions.csproj", "{5CC86773-7762-4FB7-9B6E-F4002F286AD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Abstractions", "..\Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj", "{4BEF5648-8DBF-4E16-B6E6-6F80694E140D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "..\Microsoft.Extensions.Logging.Configuration\ref\Microsoft.Extensions.Logging.Configuration.csproj", "{E68B2719-B7A0-46F4-A5F0-72BB03BF8167}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Configuration", "..\Microsoft.Extensions.Logging.Configuration\src\Microsoft.Extensions.Logging.Configuration.csproj", "{9D96B3BD-B371-4E44-A43F-50B8EEBEC889}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "..\Microsoft.Extensions.Logging.Console\ref\Microsoft.Extensions.Logging.Console.csproj", "{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Console", "..\Microsoft.Extensions.Logging.Console\src\Microsoft.Extensions.Logging.Console.csproj", "{F700E4AF-073D-4C1D-A8C2-84E744EBC374}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "..\Microsoft.Extensions.Logging.Debug\ref\Microsoft.Extensions.Logging.Debug.csproj", "{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Debug", "..\Microsoft.Extensions.Logging.Debug\src\Microsoft.Extensions.Logging.Debug.csproj", "{25E16BD1-98CA-482E-87BB-3A2A596503C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "..\Microsoft.Extensions.Logging.EventLog\ref\Microsoft.Extensions.Logging.EventLog.csproj", "{048A4E28-14AA-4BA5-A647-25B21E1C4AAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.EventLog", "..\Microsoft.Extensions.Logging.EventLog\src\Microsoft.Extensions.Logging.EventLog.csproj", "{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.TraceSource", "..\Microsoft.Extensions.Logging.TraceSource\ref\Microsoft.Extensions.Logging.TraceSource.csproj", "{997A2A76-84D0-4F39-BC09-BD5DD03C2A07}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.TraceSource", "..\Microsoft.Extensions.Logging.TraceSource\src\Microsoft.Extensions.Logging.TraceSource.csproj", "{5A2CE5B3-A089-47FC-A1E0-455C54102C2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "ref\Microsoft.Extensions.Logging.csproj", "{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging", "src\Microsoft.Extensions.Logging.csproj", "{91E18134-CEEA-4E42-9620-C4120EF34AEE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Tests", "tests\Common\Microsoft.Extensions.Logging.Tests.csproj", "{8BA3C396-9F2E-4671-BC07-221DC714B855}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Logging.Testing.Tests", "tests\DI.Common\Common\tests\Microsoft.Extensions.Logging.Testing.Tests.csproj", "{78D7E710-1AE5-408B-AE64-99382A819D09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{49DDAE0B-EF27-4B28-8554-82F85234F48C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{02437B60-112D-49D7-8C95-6118A147CC2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{4FAEF817-3333-4813-86FF-F0255E000F7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{56738F24-0431-4782-98E2-2DC4B77BF831}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3999B134-4509-44FC-B0B1-3C475D350301}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{50DC8AF9-337B-425C-8D5F-1DCB0CAA152C}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{425C299F-7D53-49EC-92D0-22B77BEA12D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{05F000EA-3FB9-46D5-9504-E10E2B344643}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{AFEEA249-A93E-4DDC-A3BF-D00C37678FF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{012BA90D-8171-4C14-A811-5B1C7B239B9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BDD17B26-4F68-417D-9194-E9FC80E78A22}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CEC828F9-B934-4215-BB03-53D026558ED5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{76C11164-C5E0-4A52-AAF1-0AFF7F5D6012}"
+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.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{D7124B9F-9A42-4AA1-981C-31EDCCEA28A0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E1999D6F-80E4-420A-A5EB-4554B0294758}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{A0EFB762-B4CF-4A47-9B1C-B62C674C4487}"
+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", "..\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\src\System.Threading.AccessControl.csproj", "{504464B5-B163-4D6B-A113-52DDC78A401D}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{1E1B25F0-7B14-4798-BBF4-156A52949CBA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{88957302-AFDD-4923-BF5A-336EAB5F28B7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{62569F09-F901-4240-B3E1-E2FF90544D74}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7F66E50D-B9E1-4229-85CE-61BCA70EA568} = {88957302-AFDD-4923-BF5A-336EAB5F28B7}
+		{8BA3C396-9F2E-4671-BC07-221DC714B855} = {88957302-AFDD-4923-BF5A-336EAB5F28B7}
+		{78D7E710-1AE5-408B-AE64-99382A819D09} = {88957302-AFDD-4923-BF5A-336EAB5F28B7}
+		{C4B04D68-8344-41D2-B46C-3BB5F31799EC} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{9384A49A-C77F-44E1-A18C-E4EE831DE7F0} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{86FE36DC-1F35-4939-8937-18541614EF6D} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{443CE9ED-69A5-4B76-A67B-F1BB32F2D1E7} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{6FDFE85B-20C3-493F-AF29-B39718761A85} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{D87888FB-98CD-4A24-AC6D-2AC89322D0F5} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{4B33E878-3451-4B2E-9AC5-849F77EE02D3} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{BECB0DC7-4194-4C4F-B821-8C8410303013} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{FBD6DA27-FBFB-42AB-A56C-7D0147A15028} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{B3A732E4-93F1-4827-8B39-4119DEF3E4E5} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{F61AC077-D30A-4F65-9831-5F9DC23B3561} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{5CC86773-7762-4FB7-9B6E-F4002F286AD4} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{E68B2719-B7A0-46F4-A5F0-72BB03BF8167} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{3F0FF3F0-514D-44A6-BFF5-2CDE790E7B8F} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{E4BF0F7E-3891-419A-BEA4-0B6485BFEE79} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{048A4E28-14AA-4BA5-A647-25B21E1C4AAA} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{997A2A76-84D0-4F39-BC09-BD5DD03C2A07} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{49DDAE0B-EF27-4B28-8554-82F85234F48C} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{56738F24-0431-4782-98E2-2DC4B77BF831} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{3999B134-4509-44FC-B0B1-3C475D350301} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{DD948842-60C4-4385-9F0B-9B2702379A9E} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{05F000EA-3FB9-46D5-9504-E10E2B344643} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{012BA90D-8171-4C14-A811-5B1C7B239B9E} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{CEC828F9-B934-4215-BB03-53D026558ED5} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{DDE4AAB2-E249-4A1A-A0CB-4C1AF440B620} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{E1999D6F-80E4-420A-A5EB-4554B0294758} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{7467E5B1-7454-4277-A84F-E8BE34A80CE4} = {62569F09-F901-4240-B3E1-E2FF90544D74}
+		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{D698D832-B15A-4C2E-8C6A-D8F97044000A} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{AB6345AD-EF69-42DD-BC90-5A7FE394358F} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{CF5604F2-EDD6-4A63-8E60-E327D91BA532} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{6104AAC7-3F96-4674-9A26-A2D6DFEC0D76} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{335D852A-CE30-4038-9AD4-B70B268BB69F} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{31E317F8-F766-4EC3-8101-2D92CDB407CD} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{5F0CF40F-D54D-4101-94EA-8FE7F9C843CB} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{7C562B37-19E5-44BE-85D5-15FFA9FAEF5A} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{9D96B3BD-B371-4E44-A43F-50B8EEBEC889} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{F700E4AF-073D-4C1D-A8C2-84E744EBC374} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{25E16BD1-98CA-482E-87BB-3A2A596503C7} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{5A2CE5B3-A089-47FC-A1E0-455C54102C2D} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{91E18134-CEEA-4E42-9620-C4120EF34AEE} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{02437B60-112D-49D7-8C95-6118A147CC2A} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{4FAEF817-3333-4813-86FF-F0255E000F7D} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{E41BE1F8-AB36-414F-A914-62C7E1915473} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{50DC8AF9-337B-425C-8D5F-1DCB0CAA152C} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{7CB59805-CD93-4D2A-BD21-A97820DD35B0} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{425C299F-7D53-49EC-92D0-22B77BEA12D2} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{AFEEA249-A93E-4DDC-A3BF-D00C37678FF9} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{BDD17B26-4F68-417D-9194-E9FC80E78A22} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{76C11164-C5E0-4A52-AAF1-0AFF7F5D6012} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{D7124B9F-9A42-4AA1-981C-31EDCCEA28A0} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{A0EFB762-B4CF-4A47-9B1C-B62C674C4487} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{B5B30447-25D0-42C0-920A-092247C95664} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{34C22E86-B0A3-457D-B8D9-7CF47AAF2570} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{504464B5-B163-4D6B-A113-52DDC78A401D} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+		{1E1B25F0-7B14-4798-BBF4-156A52949CBA} = {35D3ECF9-E321-4AA6-BF5B-41E7AC54A620}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{77C35C58-003F-46AB-AECC-20E19E99D4B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77C35C58-003F-46AB-AECC-20E19E99D4B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77C35C58-003F-46AB-AECC-20E19E99D4B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77C35C58-003F-46AB-AECC-20E19E99D4B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{589F92D4-A2DE-4BC4-870E-777F0F768A62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{589F92D4-A2DE-4BC4-870E-777F0F768A62}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{589F92D4-A2DE-4BC4-870E-777F0F768A62}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{589F92D4-A2DE-4BC4-870E-777F0F768A62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57A1A1A3-A351-4733-912D-6FF725C269AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57A1A1A3-A351-4733-912D-6FF725C269AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57A1A1A3-A351-4733-912D-6FF725C269AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57A1A1A3-A351-4733-912D-6FF725C269AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB968316-DB05-4237-8925-E074E34353E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB968316-DB05-4237-8925-E074E34353E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB968316-DB05-4237-8925-E074E34353E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB968316-DB05-4237-8925-E074E34353E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23079270-3FED-4C99-9F13-637B79150A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23079270-3FED-4C99-9F13-637B79150A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23079270-3FED-4C99-9F13-637B79150A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23079270-3FED-4C99-9F13-637B79150A95}.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
+		{7F66E50D-B9E1-4229-85CE-61BCA70EA568}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4B04D68-8344-41D2-B46C-3BB5F31799EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F2183DF-AAE1-4BCD-99E2-A45AC5C824AD}.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
+		{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
+		{70DC5F6E-AAE0-46FC-A483-F5379BF8C6D6}.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
+		{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
+		{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
+		{AB6345AD-EF69-42DD-BC90-5A7FE394358F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F7FA324-F7E6-4D71-891F-780B56DD9D3E}.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
+		{335D852A-CE30-4038-9AD4-B70B268BB69F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{335D852A-CE30-4038-9AD4-B70B268BB69F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{335D852A-CE30-4038-9AD4-B70B268BB69F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{335D852A-CE30-4038-9AD4-B70B268BB69F}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{5CC86773-7762-4FB7-9B6E-F4002F286AD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BEF5648-8DBF-4E16-B6E6-6F80694E140D}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{4D4CFD62-79A1-4D30-9E63-BB8C68E0B5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{9693C6EE-0DA9-4AA0-84DB-00EA5B3BB8DA}.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
+		{8BA3C396-9F2E-4671-BC07-221DC714B855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{17CBE7CC-5614-4CEB-8498-FC81B4A0FEF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FAEF817-3333-4813-86FF-F0255E000F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FAEF817-3333-4813-86FF-F0255E000F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FAEF817-3333-4813-86FF-F0255E000F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FAEF817-3333-4813-86FF-F0255E000F7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56738F24-0431-4782-98E2-2DC4B77BF831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{E41BE1F8-AB36-414F-A914-62C7E1915473}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3999B134-4509-44FC-B0B1-3C475D350301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3999B134-4509-44FC-B0B1-3C475D350301}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3999B134-4509-44FC-B0B1-3C475D350301}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3999B134-4509-44FC-B0B1-3C475D350301}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50DC8AF9-337B-425C-8D5F-1DCB0CAA152C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50DC8AF9-337B-425C-8D5F-1DCB0CAA152C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50DC8AF9-337B-425C-8D5F-1DCB0CAA152C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50DC8AF9-337B-425C-8D5F-1DCB0CAA152C}.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
+		{7CB59805-CD93-4D2A-BD21-A97820DD35B0}.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
+		{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
+		{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
+		{9EB3E70F-09B0-4DCB-8963-6A05E5B8E660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05F000EA-3FB9-46D5-9504-E10E2B344643}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05F000EA-3FB9-46D5-9504-E10E2B344643}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05F000EA-3FB9-46D5-9504-E10E2B344643}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05F000EA-3FB9-46D5-9504-E10E2B344643}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFEEA249-A93E-4DDC-A3BF-D00C37678FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFEEA249-A93E-4DDC-A3BF-D00C37678FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFEEA249-A93E-4DDC-A3BF-D00C37678FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFEEA249-A93E-4DDC-A3BF-D00C37678FF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{012BA90D-8171-4C14-A811-5B1C7B239B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{BDD17B26-4F68-417D-9194-E9FC80E78A22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDD17B26-4F68-417D-9194-E9FC80E78A22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDD17B26-4F68-417D-9194-E9FC80E78A22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDD17B26-4F68-417D-9194-E9FC80E78A22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEC828F9-B934-4215-BB03-53D026558ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEC828F9-B934-4215-BB03-53D026558ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEC828F9-B934-4215-BB03-53D026558ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEC828F9-B934-4215-BB03-53D026558ED5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76C11164-C5E0-4A52-AAF1-0AFF7F5D6012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76C11164-C5E0-4A52-AAF1-0AFF7F5D6012}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76C11164-C5E0-4A52-AAF1-0AFF7F5D6012}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76C11164-C5E0-4A52-AAF1-0AFF7F5D6012}.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
+		{D7124B9F-9A42-4AA1-981C-31EDCCEA28A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7124B9F-9A42-4AA1-981C-31EDCCEA28A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7124B9F-9A42-4AA1-981C-31EDCCEA28A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7124B9F-9A42-4AA1-981C-31EDCCEA28A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1999D6F-80E4-420A-A5EB-4554B0294758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1999D6F-80E4-420A-A5EB-4554B0294758}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1999D6F-80E4-420A-A5EB-4554B0294758}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1999D6F-80E4-420A-A5EB-4554B0294758}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0EFB762-B4CF-4A47-9B1C-B62C674C4487}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0EFB762-B4CF-4A47-9B1C-B62C674C4487}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0EFB762-B4CF-4A47-9B1C-B62C674C4487}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0EFB762-B4CF-4A47-9B1C-B62C674C4487}.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
+		{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
+		{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
+		{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
+		{1E1B25F0-7B14-4798-BBF4-156A52949CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E1B25F0-7B14-4798-BBF4-156A52949CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E1B25F0-7B14-4798-BBF4-156A52949CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E1B25F0-7B14-4798-BBF4-156A52949CBA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{77C35C58-003F-46AB-AECC-20E19E99D4B2} = {506843F3-0B42-4654-887D-350335DFDE54}
-		{589F92D4-A2DE-4BC4-870E-777F0F768A62} = {9AD546DC-EDBD-46DB-B5E6-880A5DE0E07B}
-		{1F3C5022-ADFF-455C-B1B1-224CC13961DF} = {787403B8-4C97-440D-A171-ED3725B2E16A}
-		{70168406-EAF0-47A8-B5C4-12B34686738F} = {787403B8-4C97-440D-A171-ED3725B2E16A}
-		{57A1A1A3-A351-4733-912D-6FF725C269AC} = {70168406-EAF0-47A8-B5C4-12B34686738F}
-		{AB968316-DB05-4237-8925-E074E34353E3} = {1F3C5022-ADFF-455C-B1B1-224CC13961DF}
-		{23079270-3FED-4C99-9F13-637B79150A95} = {787403B8-4C97-440D-A171-ED3725B2E16A}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7B8E1A89-1EAA-4C3D-AD1B-EFF67D45FEEB}
+		SolutionGuid = {B57B7C13-740F-4482-B7B6-B5E87014ACB1}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln
index 4782d11b90add0..18784c43b7a1ee 100644
--- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln
+++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/Microsoft.Extensions.Options.ConfigurationExtensions.sln
@@ -1,76 +1,198 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9EDF28B3-F998-47FE-B23A-753205641B49}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E6903177-761B-4A40-BD67-85095C73119D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BF3EE9AA-4B66-4410-B1D2-3971169F1E40}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{F0815ADD-0115-4368-886E-2135355BC439}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{3654E473-6D57-4442-A5F6-5642C09BDC95}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{D4C213E7-336F-4601-9F92-1D632D082422}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{871819C7-366E-47E9-B737-ADB9715B0BCA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4CB60D51-6D36-49DB-A3AC-B45664F39EFC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{294A92FD-4500-4691-8309-6D11E5E6E6CB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions.Tests", "tests\Microsoft.Extensions.Options.ConfigurationExtensions.Tests.csproj", "{5F41C8C2-663D-4D57-9211-2F495D7DFACE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3EFE3DA9-F864-40A3-8892-899D731CC027}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{7AC93447-67F2-4445-86D2-E13D52156BAE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{D8AC9F6D-95FA-4377-A867-FF75683393AA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{DD82A650-1266-4BB0-8670-E42EE74B8E8A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{1F88377A-7C91-466E-9351-1B0AE0DF78AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{D2E0380B-1815-43BF-8E5D-C21EF3BCAE1B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{D53344C9-58C5-4A2B-8182-74A48763A8FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D71B5E1B-8289-4B46-B679-80E32145EFA9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D56AC2F3-EDE5-44A6-A106-15682F84BFFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{682D3494-5A45-4201-B981-19AF7C5319E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{B451D5F7-0592-40C1-B101-17259BBF11F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{E9C0F645-340E-4310-95A3-4971B0272546}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{4E761C7D-24C5-430B-AD84-1634164C6AF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions.Tests", "tests\Microsoft.Extensions.Options.ConfigurationExtensions.Tests.csproj", "{94A222A2-4E1F-4013-80E0-0435E22B0F61}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{AAB799C3-8D63-4334-A9AE-D645EC848174}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{E8051516-B4B6-479E-BA8D-F3355B169F8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{616C55BF-AE90-47F2-A005-980CADDBD990}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FBACD20C-BA4A-430E-84CF-E0F9325C3DD9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5447C9E-2B11-4D59-9159-7734785A9B5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{86254E0A-1477-4DBF-A2A2-235E09B89B37}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F6D5D48E-8D70-42B3-8FF3-D57C30380F13}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8CC18098-E6BD-472D-B751-14FE93814F9C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{89537832-1CE5-4C59-B5BD-05CE687B1024}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{32A55790-26C9-4C6A-B0A6-AAED8488F368}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E6903177-761B-4A40-BD67-85095C73119D} = {8CC18098-E6BD-472D-B751-14FE93814F9C}
+		{94A222A2-4E1F-4013-80E0-0435E22B0F61} = {8CC18098-E6BD-472D-B751-14FE93814F9C}
+		{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{871819C7-366E-47E9-B737-ADB9715B0BCA} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{DD82A650-1266-4BB0-8670-E42EE74B8E8A} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{D71B5E1B-8289-4B46-B679-80E32145EFA9} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{682D3494-5A45-4201-B981-19AF7C5319E8} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{E9C0F645-340E-4310-95A3-4971B0272546} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{E8051516-B4B6-479E-BA8D-F3355B169F8D} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{FBACD20C-BA4A-430E-84CF-E0F9325C3DD9} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{86254E0A-1477-4DBF-A2A2-235E09B89B37} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{F6D5D48E-8D70-42B3-8FF3-D57C30380F13} = {89537832-1CE5-4C59-B5BD-05CE687B1024}
+		{3654E473-6D57-4442-A5F6-5642C09BDC95} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{294A92FD-4500-4691-8309-6D11E5E6E6CB} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{7AC93447-67F2-4445-86D2-E13D52156BAE} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{D2E0380B-1815-43BF-8E5D-C21EF3BCAE1B} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{D56AC2F3-EDE5-44A6-A106-15682F84BFFE} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{B451D5F7-0592-40C1-B101-17259BBF11F3} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{4E761C7D-24C5-430B-AD84-1634164C6AF4} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{AAB799C3-8D63-4334-A9AE-D645EC848174} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{616C55BF-AE90-47F2-A005-980CADDBD990} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+		{E5447C9E-2B11-4D59-9159-7734785A9B5A} = {32A55790-26C9-4C6A-B0A6-AAED8488F368}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F0815ADD-0115-4368-886E-2135355BC439}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0815ADD-0115-4368-886E-2135355BC439}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0815ADD-0115-4368-886E-2135355BC439}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0815ADD-0115-4368-886E-2135355BC439}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D4C213E7-336F-4601-9F92-1D632D082422}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4C213E7-336F-4601-9F92-1D632D082422}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4C213E7-336F-4601-9F92-1D632D082422}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4C213E7-336F-4601-9F92-1D632D082422}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F41C8C2-663D-4D57-9211-2F495D7DFACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F41C8C2-663D-4D57-9211-2F495D7DFACE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F41C8C2-663D-4D57-9211-2F495D7DFACE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F41C8C2-663D-4D57-9211-2F495D7DFACE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EFE3DA9-F864-40A3-8892-899D731CC027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EFE3DA9-F864-40A3-8892-899D731CC027}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EFE3DA9-F864-40A3-8892-899D731CC027}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EFE3DA9-F864-40A3-8892-899D731CC027}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8AC9F6D-95FA-4377-A867-FF75683393AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8AC9F6D-95FA-4377-A867-FF75683393AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8AC9F6D-95FA-4377-A867-FF75683393AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8AC9F6D-95FA-4377-A867-FF75683393AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F88377A-7C91-466E-9351-1B0AE0DF78AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F88377A-7C91-466E-9351-1B0AE0DF78AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F88377A-7C91-466E-9351-1B0AE0DF78AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F88377A-7C91-466E-9351-1B0AE0DF78AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D53344C9-58C5-4A2B-8182-74A48763A8FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D53344C9-58C5-4A2B-8182-74A48763A8FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D53344C9-58C5-4A2B-8182-74A48763A8FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D53344C9-58C5-4A2B-8182-74A48763A8FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6903177-761B-4A40-BD67-85095C73119D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6903177-761B-4A40-BD67-85095C73119D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6903177-761B-4A40-BD67-85095C73119D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6903177-761B-4A40-BD67-85095C73119D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12321E9E-FB5F-4D8C-8F9A-C03E1862EF8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3654E473-6D57-4442-A5F6-5642C09BDC95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3654E473-6D57-4442-A5F6-5642C09BDC95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3654E473-6D57-4442-A5F6-5642C09BDC95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3654E473-6D57-4442-A5F6-5642C09BDC95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{871819C7-366E-47E9-B737-ADB9715B0BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{871819C7-366E-47E9-B737-ADB9715B0BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{871819C7-366E-47E9-B737-ADB9715B0BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{871819C7-366E-47E9-B737-ADB9715B0BCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{294A92FD-4500-4691-8309-6D11E5E6E6CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{294A92FD-4500-4691-8309-6D11E5E6E6CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{294A92FD-4500-4691-8309-6D11E5E6E6CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{294A92FD-4500-4691-8309-6D11E5E6E6CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C53F87D-1638-4F8B-99E0-5FDA13A5AEC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AC93447-67F2-4445-86D2-E13D52156BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AC93447-67F2-4445-86D2-E13D52156BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AC93447-67F2-4445-86D2-E13D52156BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AC93447-67F2-4445-86D2-E13D52156BAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD82A650-1266-4BB0-8670-E42EE74B8E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD82A650-1266-4BB0-8670-E42EE74B8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD82A650-1266-4BB0-8670-E42EE74B8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD82A650-1266-4BB0-8670-E42EE74B8E8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2E0380B-1815-43BF-8E5D-C21EF3BCAE1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2E0380B-1815-43BF-8E5D-C21EF3BCAE1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2E0380B-1815-43BF-8E5D-C21EF3BCAE1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2E0380B-1815-43BF-8E5D-C21EF3BCAE1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D71B5E1B-8289-4B46-B679-80E32145EFA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D71B5E1B-8289-4B46-B679-80E32145EFA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D71B5E1B-8289-4B46-B679-80E32145EFA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D71B5E1B-8289-4B46-B679-80E32145EFA9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D56AC2F3-EDE5-44A6-A106-15682F84BFFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D56AC2F3-EDE5-44A6-A106-15682F84BFFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D56AC2F3-EDE5-44A6-A106-15682F84BFFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D56AC2F3-EDE5-44A6-A106-15682F84BFFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{682D3494-5A45-4201-B981-19AF7C5319E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{682D3494-5A45-4201-B981-19AF7C5319E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{682D3494-5A45-4201-B981-19AF7C5319E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{682D3494-5A45-4201-B981-19AF7C5319E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B451D5F7-0592-40C1-B101-17259BBF11F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B451D5F7-0592-40C1-B101-17259BBF11F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B451D5F7-0592-40C1-B101-17259BBF11F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B451D5F7-0592-40C1-B101-17259BBF11F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9C0F645-340E-4310-95A3-4971B0272546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9C0F645-340E-4310-95A3-4971B0272546}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9C0F645-340E-4310-95A3-4971B0272546}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9C0F645-340E-4310-95A3-4971B0272546}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E761C7D-24C5-430B-AD84-1634164C6AF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E761C7D-24C5-430B-AD84-1634164C6AF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E761C7D-24C5-430B-AD84-1634164C6AF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E761C7D-24C5-430B-AD84-1634164C6AF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94A222A2-4E1F-4013-80E0-0435E22B0F61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94A222A2-4E1F-4013-80E0-0435E22B0F61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94A222A2-4E1F-4013-80E0-0435E22B0F61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94A222A2-4E1F-4013-80E0-0435E22B0F61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C4B33AA-C88E-4E36-B06D-AC8BE4FDCB5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAB799C3-8D63-4334-A9AE-D645EC848174}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAB799C3-8D63-4334-A9AE-D645EC848174}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAB799C3-8D63-4334-A9AE-D645EC848174}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAB799C3-8D63-4334-A9AE-D645EC848174}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8051516-B4B6-479E-BA8D-F3355B169F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8051516-B4B6-479E-BA8D-F3355B169F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8051516-B4B6-479E-BA8D-F3355B169F8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8051516-B4B6-479E-BA8D-F3355B169F8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{616C55BF-AE90-47F2-A005-980CADDBD990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{616C55BF-AE90-47F2-A005-980CADDBD990}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{616C55BF-AE90-47F2-A005-980CADDBD990}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{616C55BF-AE90-47F2-A005-980CADDBD990}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBACD20C-BA4A-430E-84CF-E0F9325C3DD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBACD20C-BA4A-430E-84CF-E0F9325C3DD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBACD20C-BA4A-430E-84CF-E0F9325C3DD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBACD20C-BA4A-430E-84CF-E0F9325C3DD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0175BBDC-9C0F-4648-AE71-C9A2304EA6F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5447C9E-2B11-4D59-9159-7734785A9B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5447C9E-2B11-4D59-9159-7734785A9B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5447C9E-2B11-4D59-9159-7734785A9B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5447C9E-2B11-4D59-9159-7734785A9B5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86254E0A-1477-4DBF-A2A2-235E09B89B37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86254E0A-1477-4DBF-A2A2-235E09B89B37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86254E0A-1477-4DBF-A2A2-235E09B89B37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86254E0A-1477-4DBF-A2A2-235E09B89B37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6D5D48E-8D70-42B3-8FF3-D57C30380F13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6D5D48E-8D70-42B3-8FF3-D57C30380F13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6D5D48E-8D70-42B3-8FF3-D57C30380F13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6D5D48E-8D70-42B3-8FF3-D57C30380F13}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F0815ADD-0115-4368-886E-2135355BC439} = {9EDF28B3-F998-47FE-B23A-753205641B49}
-		{D4C213E7-336F-4601-9F92-1D632D082422} = {BF3EE9AA-4B66-4410-B1D2-3971169F1E40}
-		{5F41C8C2-663D-4D57-9211-2F495D7DFACE} = {4CB60D51-6D36-49DB-A3AC-B45664F39EFC}
-		{3EFE3DA9-F864-40A3-8892-899D731CC027} = {4CB60D51-6D36-49DB-A3AC-B45664F39EFC}
-		{D8AC9F6D-95FA-4377-A867-FF75683393AA} = {4CB60D51-6D36-49DB-A3AC-B45664F39EFC}
-		{1F88377A-7C91-466E-9351-1B0AE0DF78AB} = {4CB60D51-6D36-49DB-A3AC-B45664F39EFC}
-		{D53344C9-58C5-4A2B-8182-74A48763A8FE} = {4CB60D51-6D36-49DB-A3AC-B45664F39EFC}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0414F2BB-333F-487E-92AE-530AA983499B}
+		SolutionGuid = {3A661B81-588D-49A6-A245-E9B7EA9C3FE4}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln
index fc83c80d7d03cd..126c3943220fa3 100644
--- a/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln
+++ b/src/libraries/Microsoft.Extensions.Options.DataAnnotations/Microsoft.Extensions.Options.DataAnnotations.sln
@@ -1,39 +1,98 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1E622531-91C7-4268-AF09-AA2DB3CD7C61}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{D158597C-16FF-4911-A214-C265C09F4AE4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EBF96045-44A0-4E1D-ADE6-1EE33A8DCAA6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{2DB8E45F-D3EF-47A7-847E-0311AE734314}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.DataAnnotations", "ref\Microsoft.Extensions.Options.DataAnnotations.csproj", "{A1DE8D54-198E-49F7-9E8F-0C8DCB2A65F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.DataAnnotations", "ref\Microsoft.Extensions.Options.DataAnnotations.csproj", "{D1140557-6F25-44E9-9497-E354DC2576A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.DataAnnotations", "src\Microsoft.Extensions.Options.DataAnnotations.csproj", "{E94338A1-037D-4F2D-8F86-529D978959C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.DataAnnotations", "src\Microsoft.Extensions.Options.DataAnnotations.csproj", "{9022313F-BEEA-426E-8185-096E0516D1B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\ref\Microsoft.Extensions.Options.csproj", "{8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "..\Microsoft.Extensions.Options\src\Microsoft.Extensions.Options.csproj", "{72D4F48A-A93B-471F-B9C7-64BC9BF22A09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{0E60E743-56C9-466D-A428-232FEAEEF41E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\src\Microsoft.Extensions.Primitives.csproj", "{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "..\System.ComponentModel.Annotations\src\System.ComponentModel.Annotations.csproj", "{3DEF4BAD-BAD0-456E-AF67-55D5460CF3D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{176D75D6-80A3-4B87-A2A1-316AFA637F3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DAEC9B39-32E0-481A-972B-087755C49502}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{088AC251-3D1F-4E81-81DE-BBA2A0C7F931}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C534FE40-D3E6-42BE-B7E9-C76EFF988906}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D158597C-16FF-4911-A214-C265C09F4AE4} = {088AC251-3D1F-4E81-81DE-BBA2A0C7F931}
+		{D1140557-6F25-44E9-9497-E354DC2576A1} = {088AC251-3D1F-4E81-81DE-BBA2A0C7F931}
+		{8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544} = {088AC251-3D1F-4E81-81DE-BBA2A0C7F931}
+		{0E60E743-56C9-466D-A428-232FEAEEF41E} = {088AC251-3D1F-4E81-81DE-BBA2A0C7F931}
+		{176D75D6-80A3-4B87-A2A1-316AFA637F3B} = {088AC251-3D1F-4E81-81DE-BBA2A0C7F931}
+		{2DB8E45F-D3EF-47A7-847E-0311AE734314} = {C534FE40-D3E6-42BE-B7E9-C76EFF988906}
+		{9022313F-BEEA-426E-8185-096E0516D1B6} = {C534FE40-D3E6-42BE-B7E9-C76EFF988906}
+		{72D4F48A-A93B-471F-B9C7-64BC9BF22A09} = {C534FE40-D3E6-42BE-B7E9-C76EFF988906}
+		{065B4B16-B618-41D8-B1DE-F31AFC9E6C84} = {C534FE40-D3E6-42BE-B7E9-C76EFF988906}
+		{3DEF4BAD-BAD0-456E-AF67-55D5460CF3D7} = {C534FE40-D3E6-42BE-B7E9-C76EFF988906}
+		{DAEC9B39-32E0-481A-972B-087755C49502} = {C534FE40-D3E6-42BE-B7E9-C76EFF988906}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A1DE8D54-198E-49F7-9E8F-0C8DCB2A65F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1DE8D54-198E-49F7-9E8F-0C8DCB2A65F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1DE8D54-198E-49F7-9E8F-0C8DCB2A65F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1DE8D54-198E-49F7-9E8F-0C8DCB2A65F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E94338A1-037D-4F2D-8F86-529D978959C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E94338A1-037D-4F2D-8F86-529D978959C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E94338A1-037D-4F2D-8F86-529D978959C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E94338A1-037D-4F2D-8F86-529D978959C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D158597C-16FF-4911-A214-C265C09F4AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D158597C-16FF-4911-A214-C265C09F4AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D158597C-16FF-4911-A214-C265C09F4AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D158597C-16FF-4911-A214-C265C09F4AE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DB8E45F-D3EF-47A7-847E-0311AE734314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DB8E45F-D3EF-47A7-847E-0311AE734314}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DB8E45F-D3EF-47A7-847E-0311AE734314}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DB8E45F-D3EF-47A7-847E-0311AE734314}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1140557-6F25-44E9-9497-E354DC2576A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1140557-6F25-44E9-9497-E354DC2576A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1140557-6F25-44E9-9497-E354DC2576A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1140557-6F25-44E9-9497-E354DC2576A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9022313F-BEEA-426E-8185-096E0516D1B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9022313F-BEEA-426E-8185-096E0516D1B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9022313F-BEEA-426E-8185-096E0516D1B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9022313F-BEEA-426E-8185-096E0516D1B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F8A5D2D-A829-4E0E-9DCC-57FF2C89C544}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72D4F48A-A93B-471F-B9C7-64BC9BF22A09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72D4F48A-A93B-471F-B9C7-64BC9BF22A09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72D4F48A-A93B-471F-B9C7-64BC9BF22A09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72D4F48A-A93B-471F-B9C7-64BC9BF22A09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E60E743-56C9-466D-A428-232FEAEEF41E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E60E743-56C9-466D-A428-232FEAEEF41E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E60E743-56C9-466D-A428-232FEAEEF41E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E60E743-56C9-466D-A428-232FEAEEF41E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{065B4B16-B618-41D8-B1DE-F31AFC9E6C84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DEF4BAD-BAD0-456E-AF67-55D5460CF3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DEF4BAD-BAD0-456E-AF67-55D5460CF3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DEF4BAD-BAD0-456E-AF67-55D5460CF3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DEF4BAD-BAD0-456E-AF67-55D5460CF3D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{176D75D6-80A3-4B87-A2A1-316AFA637F3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAEC9B39-32E0-481A-972B-087755C49502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAEC9B39-32E0-481A-972B-087755C49502}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAEC9B39-32E0-481A-972B-087755C49502}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAEC9B39-32E0-481A-972B-087755C49502}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A1DE8D54-198E-49F7-9E8F-0C8DCB2A65F1} = {1E622531-91C7-4268-AF09-AA2DB3CD7C61}
-		{E94338A1-037D-4F2D-8F86-529D978959C6} = {EBF96045-44A0-4E1D-ADE6-1EE33A8DCAA6}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9E469B84-7A85-4529-AA9D-510A96881BDA}
+		SolutionGuid = {976CC898-9F51-4F78-825C-EF31520CD788}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
index 569f822cf139d6..6d3d6d883d99f0 100644
--- a/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
+++ b/src/libraries/Microsoft.Extensions.Options/Microsoft.Extensions.Options.sln
@@ -1,55 +1,219 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29827.131
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5827CC1E-1A61-4799-96B4-AB1052346A52}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F5A58A9D-3C44-4E3C-A661-1CECA84108D9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9205B11D-A45B-4F2C-BF37-8C5F26FCBDB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{201C7D67-FB1D-4259-9DB4-BF188007F9EA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CAB34510-96B9-422E-904F-C03476004E13}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{F656E22F-D8D2-4C8A-A435-01F821A1EA07}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "ref\Microsoft.Extensions.Options.csproj", "{9F96CC5A-969C-47FA-81DB-7093598A226F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\ref\Microsoft.Extensions.Configuration.Abstractions.csproj", "{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "src\Microsoft.Extensions.Options.csproj", "{0ACF563C-7E53-469A-A61D-B93916DED810}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "..\Microsoft.Extensions.Configuration.Abstractions\src\Microsoft.Extensions.Configuration.Abstractions.csproj", "{66E30CB1-ADA8-4000-9CEE-56AF40323D23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A5C2304B-0A92-427A-BD01-C7927EFA8B78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\ref\Microsoft.Extensions.Configuration.Binder.csproj", "{5E90DFC5-7D40-42E4-ADF6-7090015B7211}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.Tests", "tests\Microsoft.Extensions.Options.Tests\Microsoft.Extensions.Options.Tests.csproj", "{0905577D-D2A0-4EF1-848B-8A99F12BE3D0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "..\Microsoft.Extensions.Configuration.Binder\src\Microsoft.Extensions.Configuration.Binder.csproj", "{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\ref\Microsoft.Extensions.Configuration.csproj", "{692645D6-1F0B-4DB0-85EB-7D4042857B2D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "..\Microsoft.Extensions.Configuration\src\Microsoft.Extensions.Configuration.csproj", "{D4256787-48E0-473F-8C06-359C1BCFC8AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\ref\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{A29E2B35-847A-4304-BF0F-B0DFDC4384A1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection.Abstractions", "..\Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj", "{0F2B84D6-6C2E-4216-A8CD-DF91908F4194}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\ref\Microsoft.Extensions.DependencyInjection.csproj", "{AB7510FB-A8B8-426E-A5FB-D292F1423D5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.DependencyInjection", "..\Microsoft.Extensions.DependencyInjection\src\Microsoft.Extensions.DependencyInjection.csproj", "{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\ref\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{CD668E6C-9DD5-456E-A23A-9880A779CA14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.ConfigurationExtensions", "..\Microsoft.Extensions.Options.ConfigurationExtensions\src\Microsoft.Extensions.Options.ConfigurationExtensions.csproj", "{6AF79D67-4D64-40B4-9276-BCC06B8BAF58}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.DataAnnotations", "..\Microsoft.Extensions.Options.DataAnnotations\ref\Microsoft.Extensions.Options.DataAnnotations.csproj", "{02C282B1-23DD-429A-ADC7-345D661557E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.DataAnnotations", "..\Microsoft.Extensions.Options.DataAnnotations\src\Microsoft.Extensions.Options.DataAnnotations.csproj", "{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "ref\Microsoft.Extensions.Options.csproj", "{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options", "src\Microsoft.Extensions.Options.csproj", "{9BA945E7-0970-4CA2-A54B-F8D9B3E69917}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Options.Tests", "tests\Microsoft.Extensions.Options.Tests\Microsoft.Extensions.Options.Tests.csproj", "{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "..\Microsoft.Extensions.Primitives\ref\Microsoft.Extensions.Primitives.csproj", "{36C471D8-1D7A-4C81-8B05-2EED0984FBB4}"
+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}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FDC745D9-06C6-424E-8B80-18B7B0EB80CA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "..\System.ComponentModel.Annotations\src\System.ComponentModel.Annotations.csproj", "{BBCE1086-823D-4F31-A04B-FD0C65C4E5E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6671471B-2885-457C-9F63-D43DF9DC31C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8E7256F3-ACCF-4576-B091-CC8ADC60C33E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{FF244523-D350-4CDE-965B-D8584847E706}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{95BF61E6-787A-4584-84FC-F79F3C229CAB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6153112C-CE93-42C2-82B1-07C6B54F3162}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{389CAD0A-F948-4813-B726-E8EE4D87E6E3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F5A58A9D-3C44-4E3C-A661-1CECA84108D9} = {6153112C-CE93-42C2-82B1-07C6B54F3162}
+		{94CAA850-ABDB-4A1E-B18B-19DA0DE75CFD} = {6153112C-CE93-42C2-82B1-07C6B54F3162}
+		{201C7D67-FB1D-4259-9DB4-BF188007F9EA} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{5EA013FF-FCA7-4F0B-8EB7-14D8472A0830} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{5E90DFC5-7D40-42E4-ADF6-7090015B7211} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{692645D6-1F0B-4DB0-85EB-7D4042857B2D} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{AB7510FB-A8B8-426E-A5FB-D292F1423D5A} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{CD668E6C-9DD5-456E-A23A-9880A779CA14} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{02C282B1-23DD-429A-ADC7-345D661557E1} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{D0CAEF2C-FB83-4C32-80BD-1F516AD13FAA} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{FDC745D9-06C6-424E-8B80-18B7B0EB80CA} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{6671471B-2885-457C-9F63-D43DF9DC31C3} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{FF244523-D350-4CDE-965B-D8584847E706} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{95BF61E6-787A-4584-84FC-F79F3C229CAB} = {389CAD0A-F948-4813-B726-E8EE4D87E6E3}
+		{F656E22F-D8D2-4C8A-A435-01F821A1EA07} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{66E30CB1-ADA8-4000-9CEE-56AF40323D23} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{0A7AE964-D27E-44A8-85E1-F7A63EBC1BB6} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{D4256787-48E0-473F-8C06-359C1BCFC8AB} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{250B3EA5-65A4-4D62-B0F9-5BAAFE53BD7A} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{6AF79D67-4D64-40B4-9276-BCC06B8BAF58} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{3A6E2FA4-B745-4E4B-A82E-98CAD1177E77} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{9BA945E7-0970-4CA2-A54B-F8D9B3E69917} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{BBCE1086-823D-4F31-A04B-FD0C65C4E5E7} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+		{8E7256F3-ACCF-4576-B091-CC8ADC60C33E} = {A44137CE-47BA-48E6-AAD8-C624FF5DB5AC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F96CC5A-969C-47FA-81DB-7093598A226F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F96CC5A-969C-47FA-81DB-7093598A226F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F96CC5A-969C-47FA-81DB-7093598A226F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F96CC5A-969C-47FA-81DB-7093598A226F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0ACF563C-7E53-469A-A61D-B93916DED810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0ACF563C-7E53-469A-A61D-B93916DED810}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0ACF563C-7E53-469A-A61D-B93916DED810}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0ACF563C-7E53-469A-A61D-B93916DED810}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5C2304B-0A92-427A-BD01-C7927EFA8B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5C2304B-0A92-427A-BD01-C7927EFA8B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5C2304B-0A92-427A-BD01-C7927EFA8B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5C2304B-0A92-427A-BD01-C7927EFA8B78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0905577D-D2A0-4EF1-848B-8A99F12BE3D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0905577D-D2A0-4EF1-848B-8A99F12BE3D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0905577D-D2A0-4EF1-848B-8A99F12BE3D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0905577D-D2A0-4EF1-848B-8A99F12BE3D0}.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
+		{201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{201C7D67-FB1D-4259-9DB4-BF188007F9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{201C7D67-FB1D-4259-9DB4-BF188007F9EA}.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
+		{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
+		{66E30CB1-ADA8-4000-9CEE-56AF40323D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{692645D6-1F0B-4DB0-85EB-7D4042857B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{692645D6-1F0B-4DB0-85EB-7D4042857B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{692645D6-1F0B-4DB0-85EB-7D4042857B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{692645D6-1F0B-4DB0-85EB-7D4042857B2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4256787-48E0-473F-8C06-359C1BCFC8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{A29E2B35-847A-4304-BF0F-B0DFDC4384A1}.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
+		{0F2B84D6-6C2E-4216-A8CD-DF91908F4194}.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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{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
+		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36C471D8-1D7A-4C81-8B05-2EED0984FBB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAB5D437-EFB2-4BAC-BA0F-7323BA691B89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDC745D9-06C6-424E-8B80-18B7B0EB80CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDC745D9-06C6-424E-8B80-18B7B0EB80CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDC745D9-06C6-424E-8B80-18B7B0EB80CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDC745D9-06C6-424E-8B80-18B7B0EB80CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBCE1086-823D-4F31-A04B-FD0C65C4E5E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBCE1086-823D-4F31-A04B-FD0C65C4E5E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBCE1086-823D-4F31-A04B-FD0C65C4E5E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBCE1086-823D-4F31-A04B-FD0C65C4E5E7}.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
+		{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
+		{FF244523-D350-4CDE-965B-D8584847E706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF244523-D350-4CDE-965B-D8584847E706}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF244523-D350-4CDE-965B-D8584847E706}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF244523-D350-4CDE-965B-D8584847E706}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95BF61E6-787A-4584-84FC-F79F3C229CAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95BF61E6-787A-4584-84FC-F79F3C229CAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95BF61E6-787A-4584-84FC-F79F3C229CAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95BF61E6-787A-4584-84FC-F79F3C229CAB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9F96CC5A-969C-47FA-81DB-7093598A226F} = {5827CC1E-1A61-4799-96B4-AB1052346A52}
-		{0ACF563C-7E53-469A-A61D-B93916DED810} = {9205B11D-A45B-4F2C-BF37-8C5F26FCBDB7}
-		{A5C2304B-0A92-427A-BD01-C7927EFA8B78} = {CAB34510-96B9-422E-904F-C03476004E13}
-		{0905577D-D2A0-4EF1-848B-8A99F12BE3D0} = {CAB34510-96B9-422E-904F-C03476004E13}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5DE09ECD-4E45-4B08-B44A-327EF5203D1B}
+		SolutionGuid = {FE89CDC6-6313-439C-85D7-A81D5DF593E9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
index 4eb71ea9164358..7469288470da94 100644
--- a/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
+++ b/src/libraries/Microsoft.Extensions.Primitives/Microsoft.Extensions.Primitives.sln
@@ -1,54 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29521.150
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D69C4529-128C-4A51-AD5A-659872A4F405}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0EB2C914-0873-4AF8-9262-75B1405C842A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "ref\Microsoft.Extensions.Primitives.csproj", "{EF75497C-6CB7-4471-980A-619EA1AB8CF6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33BE7927-9C98-425D-97F5-D68510163F6C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "src\Microsoft.Extensions.Primitives.csproj", "{09E28D94-B771-48EB-800C-5A80C2C0055C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "ref\Microsoft.Extensions.Primitives.csproj", "{176BDA02-0319-4AA0-AD83-D8862CC5AD04}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives.Tests", "tests\Microsoft.Extensions.Primitives.Tests.csproj", "{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives", "src\Microsoft.Extensions.Primitives.csproj", "{36866787-9074-4B79-A339-FD9E0ADFD34D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B6E38D19-F2C3-4AC7-8314-18C384C09C78}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Primitives.Tests", "tests\Microsoft.Extensions.Primitives.Tests.csproj", "{10AEB55F-B4CD-44B8-9B82-DFCD543D5647}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7F0B7A9C-D76A-49E8-9BCF-731DD7806686}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{465384D0-985B-4906-85E4-6357117236DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{790E647B-93BB-4E17-99E0-01E49AD54B8C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{55EB22FC-B2A8-4AA6-B116-ADB84057891F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{40214708-E0E0-43F5-9BBE-AEA8E84537E0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{10749428-CC96-4F3B-B27B-EDFCC1A3DD7A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6F8430BA-F7D5-4C5C-89A6-E6F091709C58}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE} = {40214708-E0E0-43F5-9BBE-AEA8E84537E0}
+		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99} = {40214708-E0E0-43F5-9BBE-AEA8E84537E0}
+		{EF75497C-6CB7-4471-980A-619EA1AB8CF6} = {10749428-CC96-4F3B-B27B-EDFCC1A3DD7A}
+		{B6E38D19-F2C3-4AC7-8314-18C384C09C78} = {10749428-CC96-4F3B-B27B-EDFCC1A3DD7A}
+		{7F0B7A9C-D76A-49E8-9BCF-731DD7806686} = {10749428-CC96-4F3B-B27B-EDFCC1A3DD7A}
+		{790E647B-93BB-4E17-99E0-01E49AD54B8C} = {10749428-CC96-4F3B-B27B-EDFCC1A3DD7A}
+		{55EB22FC-B2A8-4AA6-B116-ADB84057891F} = {10749428-CC96-4F3B-B27B-EDFCC1A3DD7A}
+		{09E28D94-B771-48EB-800C-5A80C2C0055C} = {6F8430BA-F7D5-4C5C-89A6-E6F091709C58}
+		{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3} = {6F8430BA-F7D5-4C5C-89A6-E6F091709C58}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{176BDA02-0319-4AA0-AD83-D8862CC5AD04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{176BDA02-0319-4AA0-AD83-D8862CC5AD04}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{176BDA02-0319-4AA0-AD83-D8862CC5AD04}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{176BDA02-0319-4AA0-AD83-D8862CC5AD04}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36866787-9074-4B79-A339-FD9E0ADFD34D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36866787-9074-4B79-A339-FD9E0ADFD34D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36866787-9074-4B79-A339-FD9E0ADFD34D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36866787-9074-4B79-A339-FD9E0ADFD34D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10AEB55F-B4CD-44B8-9B82-DFCD543D5647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10AEB55F-B4CD-44B8-9B82-DFCD543D5647}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10AEB55F-B4CD-44B8-9B82-DFCD543D5647}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10AEB55F-B4CD-44B8-9B82-DFCD543D5647}.Release|Any CPU.Build.0 = Release|Any CPU
-		{465384D0-985B-4906-85E4-6357117236DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{465384D0-985B-4906-85E4-6357117236DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{465384D0-985B-4906-85E4-6357117236DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{465384D0-985B-4906-85E4-6357117236DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6663ACE-6FE4-4BB4-8B35-AB98EF62EAAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF75497C-6CB7-4471-980A-619EA1AB8CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF75497C-6CB7-4471-980A-619EA1AB8CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF75497C-6CB7-4471-980A-619EA1AB8CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF75497C-6CB7-4471-980A-619EA1AB8CF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09E28D94-B771-48EB-800C-5A80C2C0055C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09E28D94-B771-48EB-800C-5A80C2C0055C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09E28D94-B771-48EB-800C-5A80C2C0055C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09E28D94-B771-48EB-800C-5A80C2C0055C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43DBAD84-A865-4F5F-AB76-7F3EB6784E99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6E38D19-F2C3-4AC7-8314-18C384C09C78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6E38D19-F2C3-4AC7-8314-18C384C09C78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6E38D19-F2C3-4AC7-8314-18C384C09C78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6E38D19-F2C3-4AC7-8314-18C384C09C78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F0B7A9C-D76A-49E8-9BCF-731DD7806686}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45E51D0C-3EBB-4C9F-97BB-5AA6F64AE0E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{790E647B-93BB-4E17-99E0-01E49AD54B8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{790E647B-93BB-4E17-99E0-01E49AD54B8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{790E647B-93BB-4E17-99E0-01E49AD54B8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{790E647B-93BB-4E17-99E0-01E49AD54B8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55EB22FC-B2A8-4AA6-B116-ADB84057891F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55EB22FC-B2A8-4AA6-B116-ADB84057891F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55EB22FC-B2A8-4AA6-B116-ADB84057891F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55EB22FC-B2A8-4AA6-B116-ADB84057891F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{176BDA02-0319-4AA0-AD83-D8862CC5AD04} = {33BE7927-9C98-425D-97F5-D68510163F6C}
-		{36866787-9074-4B79-A339-FD9E0ADFD34D} = {D69C4529-128C-4A51-AD5A-659872A4F405}
-		{10AEB55F-B4CD-44B8-9B82-DFCD543D5647} = {0EB2C914-0873-4AF8-9262-75B1405C842A}
-		{465384D0-985B-4906-85E4-6357117236DD} = {0EB2C914-0873-4AF8-9262-75B1405C842A}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A2122D16-DA32-4D5D-9F6F-EAB3D6FA1B7E}
+		SolutionGuid = {7D279EE5-E38F-4125-AE82-6ADE52D72F26}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln b/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
index b5e6c943900e8d..a33a2cac505dde 100644
--- a/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
+++ b/src/libraries/Microsoft.IO.Redist/Microsoft.IO.Redist.sln
@@ -1,29 +1,42 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IO.Redist", "src\Microsoft.IO.Redist.csproj", "{FEF5811F-ED50-4407-A6B9-885EBD3206FB}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.IO.Redist", "src\Microsoft.IO.Redist.csproj", "{636F0ACF-D27A-42EB-A080-65BB5E21F4A0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2BF3A0D1-DE74-4A55-8074-2B274EBFE805}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{23AFD1C3-1C90-4D14-9B63-A25D82CA39A7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{36F8FB34-31DC-481E-B82E-D5CD6E061C72}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C4A9F2F8-16AD-479E-A23D-789BF708E2BE}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{636F0ACF-D27A-42EB-A080-65BB5E21F4A0} = {36F8FB34-31DC-481E-B82E-D5CD6E061C72}
+		{23AFD1C3-1C90-4D14-9B63-A25D82CA39A7} = {36F8FB34-31DC-481E-B82E-D5CD6E061C72}
+		{2BF3A0D1-DE74-4A55-8074-2B274EBFE805} = {C4A9F2F8-16AD-479E-A23D-789BF708E2BE}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEF5811F-ED50-4407-A6B9-885EBD3206FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{636F0ACF-D27A-42EB-A080-65BB5E21F4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{636F0ACF-D27A-42EB-A080-65BB5E21F4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{636F0ACF-D27A-42EB-A080-65BB5E21F4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{636F0ACF-D27A-42EB-A080-65BB5E21F4A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BF3A0D1-DE74-4A55-8074-2B274EBFE805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BF3A0D1-DE74-4A55-8074-2B274EBFE805}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BF3A0D1-DE74-4A55-8074-2B274EBFE805}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BF3A0D1-DE74-4A55-8074-2B274EBFE805}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23AFD1C3-1C90-4D14-9B63-A25D82CA39A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23AFD1C3-1C90-4D14-9B63-A25D82CA39A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23AFD1C3-1C90-4D14-9B63-A25D82CA39A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23AFD1C3-1C90-4D14-9B63-A25D82CA39A7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FEF5811F-ED50-4407-A6B9-885EBD3206FB} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CB207195-D61F-4708-B1FA-75E67F229C9A}
+		SolutionGuid = {4F40EC53-D415-4145-979B-B592535163C5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
index 25bb88e8e8b169..934abf69688a42 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
+++ b/src/libraries/Microsoft.VisualBasic.Core/Microsoft.VisualBasic.Core.sln
@@ -1,60 +1,163 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29110.143
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualBasic.Core.Tests", "tests\Microsoft.VisualBasic.Core.Tests.csproj", "{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A32671B6-5470-4F9C-9CD8-4094B9AB0799} = {A32671B6-5470-4F9C-9CD8-4094B9AB0799}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{009D39C7-821B-44E4-ABB9-8ED94464A5CB}"
 EndProject
-Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.VisualBasic.Core", "src\Microsoft.VisualBasic.Core.vbproj", "{A32671B6-5470-4F9C-9CD8-4094B9AB0799}"
-	ProjectSection(ProjectDependencies) = postProject
-		{82A4357C-0A9F-4970-AAEA-216A73D8A73E} = {82A4357C-0A9F-4970-AAEA-216A73D8A73E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualBasic.Core", "ref\Microsoft.VisualBasic.Core.csproj", "{EA1B5DA0-F263-4298-A8FC-564E9DF00771}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualBasic.Core", "ref\Microsoft.VisualBasic.Core.csproj", "{82A4357C-0A9F-4970-AAEA-216A73D8A73E}"
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.VisualBasic.Core", "src\Microsoft.VisualBasic.Core.vbproj", "{E741B977-6B3F-4DA7-A22B-251A1B3E42F7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualBasic.Core.Tests", "tests\Microsoft.VisualBasic.Core.Tests.csproj", "{476C0AEB-48CB-4978-9D35-06AA49F800B9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B661263A-D433-4E2B-8E4B-73D7FB57F1CF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{1970A570-2766-49C2-83A4-9898E295D6AF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F79F86DA-EF84-461E-B7C9-21F2A5C63251}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{34BD3E49-F367-49EA-9F57-1A8876C4C593}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{883E29F8-3B95-4011-9D73-039A90DE5D27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{3CC6002C-72B6-403D-B413-A100D910885E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{40E6CFD8-4203-49CA-A3D7-A93A2344F876}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{EE74172D-1E18-4130-B71E-C9FDF04DA0F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{34186806-2CBE-41C0-8AEB-1825DC28F946}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{CABE2B33-0131-4889-AF63-A7241629C96A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{ADEF69DC-34D8-4AF6-8F92-FD38E78321FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{FC7B68AD-00EB-4D71-8D30-6C4992E46AB0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{188DA57A-95F6-440F-85FD-1BC5CE269037}"
+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\src\System.Text.Encoding.CodePages.csproj", "{30CC7F8D-60DB-49C5-BE59-81477BFE0376}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{F364C57E-F529-4DF3-B2F4-1FF056D45752}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{85BE603A-EDD9-4EA0-B1B2-56FB76C03AE6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FA6FFFE8-080A-4470-A832-790D5FA1231D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{85C02EA3-6DD6-4F08-8FB1-1AB121177679}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{009D39C7-821B-44E4-ABB9-8ED94464A5CB} = {FA6FFFE8-080A-4470-A832-790D5FA1231D}
+		{476C0AEB-48CB-4978-9D35-06AA49F800B9} = {FA6FFFE8-080A-4470-A832-790D5FA1231D}
+		{EA1B5DA0-F263-4298-A8FC-564E9DF00771} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{B661263A-D433-4E2B-8E4B-73D7FB57F1CF} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{34BD3E49-F367-49EA-9F57-1A8876C4C593} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{883E29F8-3B95-4011-9D73-039A90DE5D27} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{40E6CFD8-4203-49CA-A3D7-A93A2344F876} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{34186806-2CBE-41C0-8AEB-1825DC28F946} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{ADEF69DC-34D8-4AF6-8F92-FD38E78321FF} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{188DA57A-95F6-440F-85FD-1BC5CE269037} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{F364C57E-F529-4DF3-B2F4-1FF056D45752} = {85C02EA3-6DD6-4F08-8FB1-1AB121177679}
+		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{1970A570-2766-49C2-83A4-9898E295D6AF} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{3CC6002C-72B6-403D-B413-A100D910885E} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{EE74172D-1E18-4130-B71E-C9FDF04DA0F6} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{CABE2B33-0131-4889-AF63-A7241629C96A} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{FC7B68AD-00EB-4D71-8D30-6C4992E46AB0} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{3ECA4E78-310C-4E3F-BEB7-422340D9D87E} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{30CC7F8D-60DB-49C5-BE59-81477BFE0376} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+		{85BE603A-EDD9-4EA0-B1B2-56FB76C03AE6} = {B1D2860E-8BBB-4BEF-990F-D13BAC56C67E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A32671B6-5470-4F9C-9CD8-4094B9AB0799}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A32671B6-5470-4F9C-9CD8-4094B9AB0799}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A32671B6-5470-4F9C-9CD8-4094B9AB0799}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A32671B6-5470-4F9C-9CD8-4094B9AB0799}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82A4357C-0A9F-4970-AAEA-216A73D8A73E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F79F86DA-EF84-461E-B7C9-21F2A5C63251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F79F86DA-EF84-461E-B7C9-21F2A5C63251}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F79F86DA-EF84-461E-B7C9-21F2A5C63251}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F79F86DA-EF84-461E-B7C9-21F2A5C63251}.Release|Any CPU.Build.0 = Release|Any CPU
+		{009D39C7-821B-44E4-ABB9-8ED94464A5CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{EA1B5DA0-F263-4298-A8FC-564E9DF00771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA1B5DA0-F263-4298-A8FC-564E9DF00771}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA1B5DA0-F263-4298-A8FC-564E9DF00771}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA1B5DA0-F263-4298-A8FC-564E9DF00771}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E741B977-6B3F-4DA7-A22B-251A1B3E42F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{476C0AEB-48CB-4978-9D35-06AA49F800B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B661263A-D433-4E2B-8E4B-73D7FB57F1CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B661263A-D433-4E2B-8E4B-73D7FB57F1CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B661263A-D433-4E2B-8E4B-73D7FB57F1CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B661263A-D433-4E2B-8E4B-73D7FB57F1CF}.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
+		{34BD3E49-F367-49EA-9F57-1A8876C4C593}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34BD3E49-F367-49EA-9F57-1A8876C4C593}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34BD3E49-F367-49EA-9F57-1A8876C4C593}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34BD3E49-F367-49EA-9F57-1A8876C4C593}.Release|Any CPU.Build.0 = Release|Any CPU
+		{883E29F8-3B95-4011-9D73-039A90DE5D27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{883E29F8-3B95-4011-9D73-039A90DE5D27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{883E29F8-3B95-4011-9D73-039A90DE5D27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{883E29F8-3B95-4011-9D73-039A90DE5D27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CC6002C-72B6-403D-B413-A100D910885E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CC6002C-72B6-403D-B413-A100D910885E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CC6002C-72B6-403D-B413-A100D910885E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CC6002C-72B6-403D-B413-A100D910885E}.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
+		{40E6CFD8-4203-49CA-A3D7-A93A2344F876}.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
+		{34186806-2CBE-41C0-8AEB-1825DC28F946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34186806-2CBE-41C0-8AEB-1825DC28F946}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34186806-2CBE-41C0-8AEB-1825DC28F946}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34186806-2CBE-41C0-8AEB-1825DC28F946}.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
+		{ADEF69DC-34D8-4AF6-8F92-FD38E78321FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADEF69DC-34D8-4AF6-8F92-FD38E78321FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADEF69DC-34D8-4AF6-8F92-FD38E78321FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADEF69DC-34D8-4AF6-8F92-FD38E78321FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC7B68AD-00EB-4D71-8D30-6C4992E46AB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC7B68AD-00EB-4D71-8D30-6C4992E46AB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC7B68AD-00EB-4D71-8D30-6C4992E46AB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC7B68AD-00EB-4D71-8D30-6C4992E46AB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{188DA57A-95F6-440F-85FD-1BC5CE269037}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{188DA57A-95F6-440F-85FD-1BC5CE269037}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{188DA57A-95F6-440F-85FD-1BC5CE269037}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{188DA57A-95F6-440F-85FD-1BC5CE269037}.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
+		{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
+		{F364C57E-F529-4DF3-B2F4-1FF056D45752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F364C57E-F529-4DF3-B2F4-1FF056D45752}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F364C57E-F529-4DF3-B2F4-1FF056D45752}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F364C57E-F529-4DF3-B2F4-1FF056D45752}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85BE603A-EDD9-4EA0-B1B2-56FB76C03AE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85BE603A-EDD9-4EA0-B1B2-56FB76C03AE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85BE603A-EDD9-4EA0-B1B2-56FB76C03AE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85BE603A-EDD9-4EA0-B1B2-56FB76C03AE6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{325260D6-D5DD-4E06-9DA2-9AF2AD9DE8C8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A32671B6-5470-4F9C-9CD8-4094B9AB0799} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{82A4357C-0A9F-4970-AAEA-216A73D8A73E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F79F86DA-EF84-461E-B7C9-21F2A5C63251} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {EE39E186-BD8A-48A6-BCD1-0B41AA481580}
+		SolutionGuid = {4C265A0A-56EF-41A8-B973-AA764175AA29}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
index eec2060ba7612e..4fb427ed075179 100644
--- a/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
+++ b/src/libraries/Microsoft.Win32.Primitives/Microsoft.Win32.Primitives.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives.Tests", "tests\Microsoft.Win32.Primitives.Tests.csproj", "{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8FFE99C0-22F8-4462-B839-970EAC1B3472} = {8FFE99C0-22F8-4462-B839-970EAC1B3472}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{069C76AC-B41A-4E17-A066-12233592145D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "src\Microsoft.Win32.Primitives.csproj", "{8FFE99C0-22F8-4462-B839-970EAC1B3472}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED} = {4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "ref\Microsoft.Win32.Primitives.csproj", "{EA142E29-EE37-4751-868B-27516AE0A209}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "ref\Microsoft.Win32.Primitives.csproj", "{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives", "src\Microsoft.Win32.Primitives.csproj", "{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Primitives.Tests", "tests\Microsoft.Win32.Primitives.Tests.csproj", "{B43D6BB6-1760-4DB9-87CB-792D42846C62}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{681251A0-97EE-4A46-B78B-8DCB7D071448}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6AA7FA31-E2BA-4CE0-9625-3616F443928E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{75E8E37F-C551-47B1-A62B-EE78C96BBDF0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{36DED890-FD7B-46EA-AC8A-6F430D418376}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F0E407F9-0902-4122-A170-C2FCEA59519D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B06A77C7-85BC-4B2D-8321-8E46F69354AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{283001F4-06E2-473B-90C7-CB35AEB7A46E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F0B26CEF-1482-4272-AD7B-D4BE2297F9AB}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{069C76AC-B41A-4E17-A066-12233592145D} = {B06A77C7-85BC-4B2D-8321-8E46F69354AB}
+		{B43D6BB6-1760-4DB9-87CB-792D42846C62} = {B06A77C7-85BC-4B2D-8321-8E46F69354AB}
+		{EA142E29-EE37-4751-868B-27516AE0A209} = {283001F4-06E2-473B-90C7-CB35AEB7A46E}
+		{681251A0-97EE-4A46-B78B-8DCB7D071448} = {283001F4-06E2-473B-90C7-CB35AEB7A46E}
+		{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9} = {283001F4-06E2-473B-90C7-CB35AEB7A46E}
+		{36DED890-FD7B-46EA-AC8A-6F430D418376} = {283001F4-06E2-473B-90C7-CB35AEB7A46E}
+		{F0E407F9-0902-4122-A170-C2FCEA59519D} = {283001F4-06E2-473B-90C7-CB35AEB7A46E}
+		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E} = {F0B26CEF-1482-4272-AD7B-D4BE2297F9AB}
+		{75E8E37F-C551-47B1-A62B-EE78C96BBDF0} = {F0B26CEF-1482-4272-AD7B-D4BE2297F9AB}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FFE99C0-22F8-4462-B839-970EAC1B3472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FFE99C0-22F8-4462-B839-970EAC1B3472}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FFE99C0-22F8-4462-B839-970EAC1B3472}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FFE99C0-22F8-4462-B839-970EAC1B3472}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AA7FA31-E2BA-4CE0-9625-3616F443928E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AA7FA31-E2BA-4CE0-9625-3616F443928E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AA7FA31-E2BA-4CE0-9625-3616F443928E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AA7FA31-E2BA-4CE0-9625-3616F443928E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{069C76AC-B41A-4E17-A066-12233592145D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{069C76AC-B41A-4E17-A066-12233592145D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{069C76AC-B41A-4E17-A066-12233592145D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{069C76AC-B41A-4E17-A066-12233592145D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA142E29-EE37-4751-868B-27516AE0A209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA142E29-EE37-4751-868B-27516AE0A209}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA142E29-EE37-4751-868B-27516AE0A209}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA142E29-EE37-4751-868B-27516AE0A209}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3BBD7D9-30F3-43D3-9D6A-C9BD5E19D32E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B43D6BB6-1760-4DB9-87CB-792D42846C62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B43D6BB6-1760-4DB9-87CB-792D42846C62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B43D6BB6-1760-4DB9-87CB-792D42846C62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B43D6BB6-1760-4DB9-87CB-792D42846C62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{681251A0-97EE-4A46-B78B-8DCB7D071448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{681251A0-97EE-4A46-B78B-8DCB7D071448}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{681251A0-97EE-4A46-B78B-8DCB7D071448}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{681251A0-97EE-4A46-B78B-8DCB7D071448}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04266CFA-9B2A-4A22-9FC1-92197EF2A9A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75E8E37F-C551-47B1-A62B-EE78C96BBDF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36DED890-FD7B-46EA-AC8A-6F430D418376}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36DED890-FD7B-46EA-AC8A-6F430D418376}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36DED890-FD7B-46EA-AC8A-6F430D418376}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36DED890-FD7B-46EA-AC8A-6F430D418376}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0E407F9-0902-4122-A170-C2FCEA59519D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0E407F9-0902-4122-A170-C2FCEA59519D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0E407F9-0902-4122-A170-C2FCEA59519D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0E407F9-0902-4122-A170-C2FCEA59519D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3B17C130-FF2C-4B41-82C6-FADF4ED7FDA0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8FFE99C0-22F8-4462-B839-970EAC1B3472} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4DB14BDE-4B2C-4F08-9FE9-789BFE78F3ED} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{6AA7FA31-E2BA-4CE0-9625-3616F443928E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {904B2FDB-F1D7-4CE0-B0CD-FFDF8C51FDF8}
+		SolutionGuid = {B6D42557-6A7E-4DEB-83B6-1A5BD020735D}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln b/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
index 2a04c0ec431622..7c6ca850d6d278 100644
--- a/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
+++ b/src/libraries/Microsoft.Win32.Registry.AccessControl/Microsoft.Win32.Registry.AccessControl.sln
@@ -1,60 +1,156 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl.Tests", "tests\Microsoft.Win32.Registry.AccessControl.Tests.csproj", "{C2B7761E-A4C0-4285-8B83-CC426A1494FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2} = {0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F9B18052-9FB9-474A-9A6A-F322DED4F7CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl", "src\Microsoft.Win32.Registry.AccessControl.csproj", "{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{389CCAC2-E1C2-4185-AC01-2035CB99B5ED} = {389CCAC2-E1C2-4185-AC01-2035CB99B5ED}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl", "ref\Microsoft.Win32.Registry.AccessControl.csproj", "{97F37414-7633-4B76-AFA4-284E26894FB4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl", "ref\Microsoft.Win32.Registry.AccessControl.csproj", "{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl", "src\Microsoft.Win32.Registry.AccessControl.csproj", "{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.AccessControl.Tests", "tests\Microsoft.Win32.Registry.AccessControl.Tests.csproj", "{BC8FAA75-A595-475E-B947-FA2D1E225B48}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{2C94FB35-3663-4B1E-B66F-E47E5575B6C9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{9EE80D0C-FD0C-4E89-9EBE-5D77567C6E53}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4309CA21-32B5-46FB-BD91-7FD19C4D131B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{AAF5420B-CA34-477A-A3A2-B03030A1949D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{D6296AE6-1A36-4344-847A-D8EA5BED0411}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{C33A1003-EC82-4905-94C6-D3CB81736BC5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9341070F-8A24-45FD-96FF-DC936EC9FE4C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DD5B2888-463A-4AB6-911F-EB0BEA47951A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CDDC6542-7D8D-44D1-9DE4-C805A5551DEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{90BF8334-49FC-4035-8A3E-095B74F792A5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{AB01DE07-3A0A-426F-80D1-A9EA048D70E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{EC1A2447-AF21-4688-BC5D-601B900A164E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{36F1318C-596B-48ED-8BFD-958A1F2B6933}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{542AEFBA-0C61-4539-A145-168B4BFE87A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{40846142-A4C2-4DB9-9E73-2BAB367EC629}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{06B0C5DE-E943-4F94-AB51-EF72C7AB3D08}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CF04704F-254D-4328-8386-3C0037F30AD3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACB48990-67CD-4827-8BF3-260AC172C384}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE4F7430-A7B7-4937-97EA-93BAC39FE918}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F9B18052-9FB9-474A-9A6A-F322DED4F7CD} = {CF04704F-254D-4328-8386-3C0037F30AD3}
+		{BC8FAA75-A595-475E-B947-FA2D1E225B48} = {CF04704F-254D-4328-8386-3C0037F30AD3}
+		{97F37414-7633-4B76-AFA4-284E26894FB4} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{2C94FB35-3663-4B1E-B66F-E47E5575B6C9} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{AAF5420B-CA34-477A-A3A2-B03030A1949D} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{D6296AE6-1A36-4344-847A-D8EA5BED0411} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{9341070F-8A24-45FD-96FF-DC936EC9FE4C} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{CDDC6542-7D8D-44D1-9DE4-C805A5551DEA} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{AB01DE07-3A0A-426F-80D1-A9EA048D70E6} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{36F1318C-596B-48ED-8BFD-958A1F2B6933} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{40846142-A4C2-4DB9-9E73-2BAB367EC629} = {ACB48990-67CD-4827-8BF3-260AC172C384}
+		{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{9EE80D0C-FD0C-4E89-9EBE-5D77567C6E53} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{C33A1003-EC82-4905-94C6-D3CB81736BC5} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{DD5B2888-463A-4AB6-911F-EB0BEA47951A} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{90BF8334-49FC-4035-8A3E-095B74F792A5} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{EC1A2447-AF21-4688-BC5D-601B900A164E} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{542AEFBA-0C61-4539-A145-168B4BFE87A7} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+		{06B0C5DE-E943-4F94-AB51-EF72C7AB3D08} = {EE4F7430-A7B7-4937-97EA-93BAC39FE918}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2B7761E-A4C0-4285-8B83-CC426A1494FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{389CCAC2-E1C2-4185-AC01-2035CB99B5ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4309CA21-32B5-46FB-BD91-7FD19C4D131B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4309CA21-32B5-46FB-BD91-7FD19C4D131B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4309CA21-32B5-46FB-BD91-7FD19C4D131B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4309CA21-32B5-46FB-BD91-7FD19C4D131B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9B18052-9FB9-474A-9A6A-F322DED4F7CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9B18052-9FB9-474A-9A6A-F322DED4F7CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9B18052-9FB9-474A-9A6A-F322DED4F7CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9B18052-9FB9-474A-9A6A-F322DED4F7CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97F37414-7633-4B76-AFA4-284E26894FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97F37414-7633-4B76-AFA4-284E26894FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97F37414-7633-4B76-AFA4-284E26894FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97F37414-7633-4B76-AFA4-284E26894FB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A0E9CD8-33FA-4E02-8EB6-5685CD84D727}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC8FAA75-A595-475E-B947-FA2D1E225B48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C94FB35-3663-4B1E-B66F-E47E5575B6C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C94FB35-3663-4B1E-B66F-E47E5575B6C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C94FB35-3663-4B1E-B66F-E47E5575B6C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C94FB35-3663-4B1E-B66F-E47E5575B6C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EE80D0C-FD0C-4E89-9EBE-5D77567C6E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EE80D0C-FD0C-4E89-9EBE-5D77567C6E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE80D0C-FD0C-4E89-9EBE-5D77567C6E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EE80D0C-FD0C-4E89-9EBE-5D77567C6E53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAF5420B-CA34-477A-A3A2-B03030A1949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAF5420B-CA34-477A-A3A2-B03030A1949D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAF5420B-CA34-477A-A3A2-B03030A1949D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAF5420B-CA34-477A-A3A2-B03030A1949D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6296AE6-1A36-4344-847A-D8EA5BED0411}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6296AE6-1A36-4344-847A-D8EA5BED0411}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6296AE6-1A36-4344-847A-D8EA5BED0411}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6296AE6-1A36-4344-847A-D8EA5BED0411}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C33A1003-EC82-4905-94C6-D3CB81736BC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C33A1003-EC82-4905-94C6-D3CB81736BC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C33A1003-EC82-4905-94C6-D3CB81736BC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C33A1003-EC82-4905-94C6-D3CB81736BC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9341070F-8A24-45FD-96FF-DC936EC9FE4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD5B2888-463A-4AB6-911F-EB0BEA47951A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDDC6542-7D8D-44D1-9DE4-C805A5551DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDDC6542-7D8D-44D1-9DE4-C805A5551DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDDC6542-7D8D-44D1-9DE4-C805A5551DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDDC6542-7D8D-44D1-9DE4-C805A5551DEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90BF8334-49FC-4035-8A3E-095B74F792A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90BF8334-49FC-4035-8A3E-095B74F792A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90BF8334-49FC-4035-8A3E-095B74F792A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90BF8334-49FC-4035-8A3E-095B74F792A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB01DE07-3A0A-426F-80D1-A9EA048D70E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB01DE07-3A0A-426F-80D1-A9EA048D70E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB01DE07-3A0A-426F-80D1-A9EA048D70E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB01DE07-3A0A-426F-80D1-A9EA048D70E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC1A2447-AF21-4688-BC5D-601B900A164E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC1A2447-AF21-4688-BC5D-601B900A164E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC1A2447-AF21-4688-BC5D-601B900A164E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC1A2447-AF21-4688-BC5D-601B900A164E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36F1318C-596B-48ED-8BFD-958A1F2B6933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36F1318C-596B-48ED-8BFD-958A1F2B6933}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36F1318C-596B-48ED-8BFD-958A1F2B6933}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36F1318C-596B-48ED-8BFD-958A1F2B6933}.Release|Any CPU.Build.0 = Release|Any CPU
+		{542AEFBA-0C61-4539-A145-168B4BFE87A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{542AEFBA-0C61-4539-A145-168B4BFE87A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{542AEFBA-0C61-4539-A145-168B4BFE87A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{542AEFBA-0C61-4539-A145-168B4BFE87A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40846142-A4C2-4DB9-9E73-2BAB367EC629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40846142-A4C2-4DB9-9E73-2BAB367EC629}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40846142-A4C2-4DB9-9E73-2BAB367EC629}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40846142-A4C2-4DB9-9E73-2BAB367EC629}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06B0C5DE-E943-4F94-AB51-EF72C7AB3D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06B0C5DE-E943-4F94-AB51-EF72C7AB3D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06B0C5DE-E943-4F94-AB51-EF72C7AB3D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06B0C5DE-E943-4F94-AB51-EF72C7AB3D08}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C2B7761E-A4C0-4285-8B83-CC426A1494FA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0E23F29E-6BB0-4B94-A5DA-B5E50601E0F2} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{389CCAC2-E1C2-4185-AC01-2035CB99B5ED} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{4309CA21-32B5-46FB-BD91-7FD19C4D131B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E2062894-CBCC-49AF-9508-20D203AE3880}
+		SolutionGuid = {E4C2B201-85CD-4255-91AF-B179414B9679}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
index 73244f72afd17f..c5d910288483b2 100644
--- a/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
+++ b/src/libraries/Microsoft.Win32.Registry/Microsoft.Win32.Registry.sln
@@ -1,60 +1,142 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.Tests", "tests\Microsoft.Win32.Registry.Tests.csproj", "{20A2BA2C-5517-483F-8FFE-643441A59852}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F} = {D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F4F537EB-4436-4407-9A42-A75FE9CEECE0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "src\Microsoft.Win32.Registry.csproj", "{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18} = {EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "ref\Microsoft.Win32.Registry.csproj", "{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "ref\Microsoft.Win32.Registry.csproj", "{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "src\Microsoft.Win32.Registry.csproj", "{3446E090-1587-4D16-AE6A-99C1788E86A6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry.Tests", "tests\Microsoft.Win32.Registry.Tests.csproj", "{E9123189-58BC-41A8-83A0-C46E74ED8160}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{2D6AA4C5-D63F-44B1-B8BD-44B3688F2ABA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{2889DB84-1F70-44F3-8BF7-3DB35A7E6099}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{971EBAFE-C07F-4638-B505-6BC894F9A52A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{4ED3C97E-D16D-4DFF-A440-B4979FE5B9C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A5C81CBD-DA02-4F78-A4E2-D1A550BAF33A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{8469BFF7-430A-4C3B-BDFC-16E6F7F82280}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C25B7434-4DEF-4EE3-9321-5F6D5AF12ABC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{0761E6E6-15AE-4FE7-8BF4-E01A20E99871}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D1F64653-14D3-4933-8C53-243B7017980D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{CF9B2263-BA4F-4A70-9777-6E8E81DCB122}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{10599055-F62F-45C1-A273-9CA54EAF1394}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{464F315E-8377-42DD-A8FB-A466DF8607D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{655A6DDF-6180-43D9-B472-3F7B68EFABFD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{92AC7F6E-2016-44CD-9717-FCE380056C72}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F4F537EB-4436-4407-9A42-A75FE9CEECE0} = {655A6DDF-6180-43D9-B472-3F7B68EFABFD}
+		{E9123189-58BC-41A8-83A0-C46E74ED8160} = {655A6DDF-6180-43D9-B472-3F7B68EFABFD}
+		{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{2D6AA4C5-D63F-44B1-B8BD-44B3688F2ABA} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{2889DB84-1F70-44F3-8BF7-3DB35A7E6099} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{A5C81CBD-DA02-4F78-A4E2-D1A550BAF33A} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{C25B7434-4DEF-4EE3-9321-5F6D5AF12ABC} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{D1F64653-14D3-4933-8C53-243B7017980D} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{10599055-F62F-45C1-A273-9CA54EAF1394} = {92AC7F6E-2016-44CD-9717-FCE380056C72}
+		{3446E090-1587-4D16-AE6A-99C1788E86A6} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+		{4ED3C97E-D16D-4DFF-A440-B4979FE5B9C9} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+		{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+		{8469BFF7-430A-4C3B-BDFC-16E6F7F82280} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+		{0761E6E6-15AE-4FE7-8BF4-E01A20E99871} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+		{CF9B2263-BA4F-4A70-9777-6E8E81DCB122} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+		{464F315E-8377-42DD-A8FB-A466DF8607D0} = {37130CB0-83C8-40E0-A1EB-7FCEF29A64FD}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20A2BA2C-5517-483F-8FFE-643441A59852}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20A2BA2C-5517-483F-8FFE-643441A59852}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{971EBAFE-C07F-4638-B505-6BC894F9A52A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{971EBAFE-C07F-4638-B505-6BC894F9A52A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{971EBAFE-C07F-4638-B505-6BC894F9A52A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{971EBAFE-C07F-4638-B505-6BC894F9A52A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4F537EB-4436-4407-9A42-A75FE9CEECE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4F537EB-4436-4407-9A42-A75FE9CEECE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4F537EB-4436-4407-9A42-A75FE9CEECE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4F537EB-4436-4407-9A42-A75FE9CEECE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC5B0E37-024C-4A09-9080-AA78F2BCE4A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3446E090-1587-4D16-AE6A-99C1788E86A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3446E090-1587-4D16-AE6A-99C1788E86A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3446E090-1587-4D16-AE6A-99C1788E86A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3446E090-1587-4D16-AE6A-99C1788E86A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9123189-58BC-41A8-83A0-C46E74ED8160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9123189-58BC-41A8-83A0-C46E74ED8160}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9123189-58BC-41A8-83A0-C46E74ED8160}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9123189-58BC-41A8-83A0-C46E74ED8160}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D6AA4C5-D63F-44B1-B8BD-44B3688F2ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D6AA4C5-D63F-44B1-B8BD-44B3688F2ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D6AA4C5-D63F-44B1-B8BD-44B3688F2ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D6AA4C5-D63F-44B1-B8BD-44B3688F2ABA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2889DB84-1F70-44F3-8BF7-3DB35A7E6099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2889DB84-1F70-44F3-8BF7-3DB35A7E6099}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2889DB84-1F70-44F3-8BF7-3DB35A7E6099}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2889DB84-1F70-44F3-8BF7-3DB35A7E6099}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ED3C97E-D16D-4DFF-A440-B4979FE5B9C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ED3C97E-D16D-4DFF-A440-B4979FE5B9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ED3C97E-D16D-4DFF-A440-B4979FE5B9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ED3C97E-D16D-4DFF-A440-B4979FE5B9C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8FEEEB3-1CEA-4EE9-ACE4-D147860E7A0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC7AEF63-5AE0-4A16-9DD7-0A55B539D906}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5C81CBD-DA02-4F78-A4E2-D1A550BAF33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5C81CBD-DA02-4F78-A4E2-D1A550BAF33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5C81CBD-DA02-4F78-A4E2-D1A550BAF33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5C81CBD-DA02-4F78-A4E2-D1A550BAF33A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8469BFF7-430A-4C3B-BDFC-16E6F7F82280}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C25B7434-4DEF-4EE3-9321-5F6D5AF12ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C25B7434-4DEF-4EE3-9321-5F6D5AF12ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C25B7434-4DEF-4EE3-9321-5F6D5AF12ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C25B7434-4DEF-4EE3-9321-5F6D5AF12ABC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0761E6E6-15AE-4FE7-8BF4-E01A20E99871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0761E6E6-15AE-4FE7-8BF4-E01A20E99871}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0761E6E6-15AE-4FE7-8BF4-E01A20E99871}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0761E6E6-15AE-4FE7-8BF4-E01A20E99871}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1F64653-14D3-4933-8C53-243B7017980D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1F64653-14D3-4933-8C53-243B7017980D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1F64653-14D3-4933-8C53-243B7017980D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1F64653-14D3-4933-8C53-243B7017980D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF9B2263-BA4F-4A70-9777-6E8E81DCB122}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10599055-F62F-45C1-A273-9CA54EAF1394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10599055-F62F-45C1-A273-9CA54EAF1394}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10599055-F62F-45C1-A273-9CA54EAF1394}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10599055-F62F-45C1-A273-9CA54EAF1394}.Release|Any CPU.Build.0 = Release|Any CPU
+		{464F315E-8377-42DD-A8FB-A466DF8607D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{464F315E-8377-42DD-A8FB-A466DF8607D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{464F315E-8377-42DD-A8FB-A466DF8607D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{464F315E-8377-42DD-A8FB-A466DF8607D0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{20A2BA2C-5517-483F-8FFE-643441A59852} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D3F18ACC-D327-4ABB-BA6C-E9C34A041B2F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{EEC02D4E-217E-4B4D-A7DA-5038FAD44A18} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{971EBAFE-C07F-4638-B505-6BC894F9A52A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1ED9DC79-D6FD-4791-A7D5-C09573807723}
+		SolutionGuid = {B41F6F2B-9220-4A42-A69F-4BF2CA7E201A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
index 26aa082a85118c..485c48861b0a09 100644
--- a/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
+++ b/src/libraries/Microsoft.Win32.SystemEvents/Microsoft.Win32.SystemEvents.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents.Tests", "tests\Microsoft.Win32.SystemEvents.Tests.csproj", "{8B21F7AD-928E-474C-875A-83D753BB8A28}"
-	ProjectSection(ProjectDependencies) = postProject
-		{91DD22C6-521E-49F9-84E8-1D65BAB97776} = {91DD22C6-521E-49F9-84E8-1D65BAB97776}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B3F56323-6D66-4576-BBF3-32ACAADE3223}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "src\Microsoft.Win32.SystemEvents.csproj", "{91DD22C6-521E-49F9-84E8-1D65BAB97776}"
-	ProjectSection(ProjectDependencies) = postProject
-		{90BAFB3A-C396-4323-AC4F-5F968230AD22} = {90BAFB3A-C396-4323-AC4F-5F968230AD22}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{18B0D99E-2938-4151-A0B1-2ABEDC98E4ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "ref\Microsoft.Win32.SystemEvents.csproj", "{90BAFB3A-C396-4323-AC4F-5F968230AD22}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "ref\Microsoft.Win32.SystemEvents.csproj", "{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "src\Microsoft.Win32.SystemEvents.csproj", "{20C56707-2960-4DF2-BF76-5556304EE7CF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents.Tests", "tests\Microsoft.Win32.SystemEvents.Tests.csproj", "{86962B5A-AC38-44FA-B25B-74ABAC57E534}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D5E761C4-CFDD-4902-9C11-5B8A11192A56}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{73535C05-CA2B-4F54-9F94-68C7F10CF896}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9956C4C9-53F3-4560-96D0-4519B40007BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{0B92B094-1AB6-45C7-84FF-9BCFD067C322}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{A0B47D96-8B49-4113-8D15-8F1E0E669F71}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A9BF0AA9-6D75-4D4A-BC58-2EAA43FAE1BF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8F5D0346-E540-4E92-B583-CD3F925695BE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{40E1401A-97F4-4156-9D57-A1AD1B07736B}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B3F56323-6D66-4576-BBF3-32ACAADE3223} = {A9BF0AA9-6D75-4D4A-BC58-2EAA43FAE1BF}
+		{86962B5A-AC38-44FA-B25B-74ABAC57E534} = {A9BF0AA9-6D75-4D4A-BC58-2EAA43FAE1BF}
+		{18B0D99E-2938-4151-A0B1-2ABEDC98E4ED} = {8F5D0346-E540-4E92-B583-CD3F925695BE}
+		{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF} = {8F5D0346-E540-4E92-B583-CD3F925695BE}
+		{D5E761C4-CFDD-4902-9C11-5B8A11192A56} = {8F5D0346-E540-4E92-B583-CD3F925695BE}
+		{0B92B094-1AB6-45C7-84FF-9BCFD067C322} = {8F5D0346-E540-4E92-B583-CD3F925695BE}
+		{A0B47D96-8B49-4113-8D15-8F1E0E669F71} = {8F5D0346-E540-4E92-B583-CD3F925695BE}
+		{20C56707-2960-4DF2-BF76-5556304EE7CF} = {40E1401A-97F4-4156-9D57-A1AD1B07736B}
+		{9956C4C9-53F3-4560-96D0-4519B40007BB} = {40E1401A-97F4-4156-9D57-A1AD1B07736B}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B21F7AD-928E-474C-875A-83D753BB8A28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8B21F7AD-928E-474C-875A-83D753BB8A28}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91DD22C6-521E-49F9-84E8-1D65BAB97776}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91DD22C6-521E-49F9-84E8-1D65BAB97776}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90BAFB3A-C396-4323-AC4F-5F968230AD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90BAFB3A-C396-4323-AC4F-5F968230AD22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90BAFB3A-C396-4323-AC4F-5F968230AD22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90BAFB3A-C396-4323-AC4F-5F968230AD22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73535C05-CA2B-4F54-9F94-68C7F10CF896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73535C05-CA2B-4F54-9F94-68C7F10CF896}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73535C05-CA2B-4F54-9F94-68C7F10CF896}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73535C05-CA2B-4F54-9F94-68C7F10CF896}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3F56323-6D66-4576-BBF3-32ACAADE3223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3F56323-6D66-4576-BBF3-32ACAADE3223}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3F56323-6D66-4576-BBF3-32ACAADE3223}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3F56323-6D66-4576-BBF3-32ACAADE3223}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18B0D99E-2938-4151-A0B1-2ABEDC98E4ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18B0D99E-2938-4151-A0B1-2ABEDC98E4ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18B0D99E-2938-4151-A0B1-2ABEDC98E4ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18B0D99E-2938-4151-A0B1-2ABEDC98E4ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A586D099-E8B0-4C2F-B4AD-BCFA98429DBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20C56707-2960-4DF2-BF76-5556304EE7CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20C56707-2960-4DF2-BF76-5556304EE7CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20C56707-2960-4DF2-BF76-5556304EE7CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20C56707-2960-4DF2-BF76-5556304EE7CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86962B5A-AC38-44FA-B25B-74ABAC57E534}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5E761C4-CFDD-4902-9C11-5B8A11192A56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9956C4C9-53F3-4560-96D0-4519B40007BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9956C4C9-53F3-4560-96D0-4519B40007BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9956C4C9-53F3-4560-96D0-4519B40007BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9956C4C9-53F3-4560-96D0-4519B40007BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B92B094-1AB6-45C7-84FF-9BCFD067C322}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B92B094-1AB6-45C7-84FF-9BCFD067C322}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B92B094-1AB6-45C7-84FF-9BCFD067C322}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B92B094-1AB6-45C7-84FF-9BCFD067C322}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0B47D96-8B49-4113-8D15-8F1E0E669F71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0B47D96-8B49-4113-8D15-8F1E0E669F71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0B47D96-8B49-4113-8D15-8F1E0E669F71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0B47D96-8B49-4113-8D15-8F1E0E669F71}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8B21F7AD-928E-474C-875A-83D753BB8A28} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{91DD22C6-521E-49F9-84E8-1D65BAB97776} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{90BAFB3A-C396-4323-AC4F-5F968230AD22} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{73535C05-CA2B-4F54-9F94-68C7F10CF896} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0C25BCF9-A5E3-41A8-8426-37B8A1180915}
+		SolutionGuid = {14621231-E5C2-4B46-9ADC-1182F2721D07}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
index be8656869e896a..005d2474bd214b 100644
--- a/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
+++ b/src/libraries/Microsoft.XmlSerializer.Generator/Microsoft.XmlSerializer.Generator.sln
@@ -1,54 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.XmlSerializer.Generator.Tests", "tests\Microsoft.XmlSerializer.Generator.Tests.csproj", "{0D1E2954-A5C7-4B8C-932A-31EB4A96A737}"
-	ProjectSection(ProjectDependencies) = postProject
-		{80958E8B-2FEB-4F95-83F9-825CA1ED26F8} = {80958E8B-2FEB-4F95-83F9-825CA1ED26F8}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C1E5B103-D955-40DB-A385-8E5FF9EEBA4E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.XmlSerializer.Generator", "src\Microsoft.XmlSerializer.Generator.csproj", "{80958E8B-2FEB-4F95-83F9-825CA1ED26F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1BB85182-9517-4E88-8373-F42C699787E9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-Microsoft.XmlSerializer.Generator", "src\Microsoft.XmlSerializer.Generator.csproj", "{3C8417AB-8E73-4EBF-B090-1367F3D23468}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.XmlSerializer.Generator.Tests", "tests\Microsoft.XmlSerializer.Generator.Tests.csproj", "{A90B6063-66BB-486C-8267-43AC8F9C5196}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{71CDAEB3-0F69-4DCD-A720-92270C4C44C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SerializableAssembly", "tests\SerializableAssembly.csproj", "{8B155C6F-4347-453C-8C4C-316D884C15C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SerializableAssembly", "tests\SerializableAssembly.csproj", "{81BE9FCA-42C2-4EFE-913C-36C291A6DD76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B3EA9B7E-FB07-4906-8878-C9DC04988ABC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5E286F47-DA0D-4F8A-A831-38F2426B23D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CA669D8B-43DF-46C8-9501-5C364140DFA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{AA8B0D66-B511-4AE5-B43F-ABBC2994DB15}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{498F50A9-3151-44C5-AEA9-37C43E78CA8B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AD97976B-3D69-4689-97E8-DE13A207B45C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{194F4A33-8141-4C36-9EED-F5D5B6137071}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C1E5B103-D955-40DB-A385-8E5FF9EEBA4E} = {498F50A9-3151-44C5-AEA9-37C43E78CA8B}
+		{A90B6063-66BB-486C-8267-43AC8F9C5196} = {498F50A9-3151-44C5-AEA9-37C43E78CA8B}
+		{8B155C6F-4347-453C-8C4C-316D884C15C3} = {498F50A9-3151-44C5-AEA9-37C43E78CA8B}
+		{1BB85182-9517-4E88-8373-F42C699787E9} = {AD97976B-3D69-4689-97E8-DE13A207B45C}
+		{B3EA9B7E-FB07-4906-8878-C9DC04988ABC} = {AD97976B-3D69-4689-97E8-DE13A207B45C}
+		{CA669D8B-43DF-46C8-9501-5C364140DFA7} = {AD97976B-3D69-4689-97E8-DE13A207B45C}
+		{AA8B0D66-B511-4AE5-B43F-ABBC2994DB15} = {AD97976B-3D69-4689-97E8-DE13A207B45C}
+		{3C8417AB-8E73-4EBF-B090-1367F3D23468} = {194F4A33-8141-4C36-9EED-F5D5B6137071}
+		{5E286F47-DA0D-4F8A-A831-38F2426B23D3} = {194F4A33-8141-4C36-9EED-F5D5B6137071}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A737}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80958E8B-2FEB-4F95-83F9-825CA1ED26F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71CDAEB3-0F69-4DCD-A720-92270C4C44C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71CDAEB3-0F69-4DCD-A720-92270C4C44C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71CDAEB3-0F69-4DCD-A720-92270C4C44C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71CDAEB3-0F69-4DCD-A720-92270C4C44C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81BE9FCA-42C2-4EFE-913C-36C291A6DD76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81BE9FCA-42C2-4EFE-913C-36C291A6DD76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81BE9FCA-42C2-4EFE-913C-36C291A6DD76}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81BE9FCA-42C2-4EFE-913C-36C291A6DD76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1E5B103-D955-40DB-A385-8E5FF9EEBA4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1E5B103-D955-40DB-A385-8E5FF9EEBA4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1E5B103-D955-40DB-A385-8E5FF9EEBA4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1E5B103-D955-40DB-A385-8E5FF9EEBA4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BB85182-9517-4E88-8373-F42C699787E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BB85182-9517-4E88-8373-F42C699787E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BB85182-9517-4E88-8373-F42C699787E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BB85182-9517-4E88-8373-F42C699787E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C8417AB-8E73-4EBF-B090-1367F3D23468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C8417AB-8E73-4EBF-B090-1367F3D23468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C8417AB-8E73-4EBF-B090-1367F3D23468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C8417AB-8E73-4EBF-B090-1367F3D23468}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A90B6063-66BB-486C-8267-43AC8F9C5196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A90B6063-66BB-486C-8267-43AC8F9C5196}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A90B6063-66BB-486C-8267-43AC8F9C5196}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A90B6063-66BB-486C-8267-43AC8F9C5196}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B155C6F-4347-453C-8C4C-316D884C15C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B155C6F-4347-453C-8C4C-316D884C15C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B155C6F-4347-453C-8C4C-316D884C15C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B155C6F-4347-453C-8C4C-316D884C15C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3EA9B7E-FB07-4906-8878-C9DC04988ABC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E286F47-DA0D-4F8A-A831-38F2426B23D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA669D8B-43DF-46C8-9501-5C364140DFA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA669D8B-43DF-46C8-9501-5C364140DFA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA669D8B-43DF-46C8-9501-5C364140DFA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA669D8B-43DF-46C8-9501-5C364140DFA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA8B0D66-B511-4AE5-B43F-ABBC2994DB15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA8B0D66-B511-4AE5-B43F-ABBC2994DB15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA8B0D66-B511-4AE5-B43F-ABBC2994DB15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA8B0D66-B511-4AE5-B43F-ABBC2994DB15}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A737} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{80958E8B-2FEB-4F95-83F9-825CA1ED26F8} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{71CDAEB3-0F69-4DCD-A720-92270C4C44C8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B97B5A28-1375-4BBF-B90B-67162AE51CC2}
+		SolutionGuid = {E4BEDA84-BAED-4E86-B18F-8417E2FD10BB}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.AppContext/System.AppContext.sln b/src/libraries/System.AppContext/System.AppContext.sln
index 0056c367e5120e..90c5de42be3103 100644
--- a/src/libraries/System.AppContext/System.AppContext.sln
+++ b/src/libraries/System.AppContext/System.AppContext.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext.Tests", "tests\System.AppContext.Tests.csproj", "{6F04B167-A03F-4206-8481-60213C3EF9B9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5522BAFC-E2FF-4896-993A-401DDEDFD85F} = {5522BAFC-E2FF-4896-993A-401DDEDFD85F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{751F6E52-BD51-406F-9EB6-06D3C27BF469}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext", "src\System.AppContext.csproj", "{5522BAFC-E2FF-4896-993A-401DDEDFD85F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2D7BBD88-739E-472A-9F44-2794049A688F} = {2D7BBD88-739E-472A-9F44-2794049A688F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext", "ref\System.AppContext.csproj", "{2D7BBD88-739E-472A-9F44-2794049A688F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext", "ref\System.AppContext.csproj", "{BB689125-CDA7-4CFA-A4D6-1C932092A67F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext", "src\System.AppContext.csproj", "{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.AppContext.Tests", "tests\System.AppContext.Tests.csproj", "{007AD19C-8A80-4463-834C-BE7AE1808A04}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2B51887D-CD24-4BF7-A010-7D45F0ACAAB9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{68E366F0-A62B-4528-8B26-CDFE17AA9C42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{207F66C5-1274-445C-B69E-E2C5F0776843}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DD112C26-1C35-4035-A7B6-373816626CE1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AA5B587C-6F16-49E9-9169-793CA4AB7C70}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{42312719-3478-4869-B4ED-19358F167B5F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469} = {DD112C26-1C35-4035-A7B6-373816626CE1}
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5} = {DD112C26-1C35-4035-A7B6-373816626CE1}
+		{207F66C5-1274-445C-B69E-E2C5F0776843} = {DD112C26-1C35-4035-A7B6-373816626CE1}
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4} = {AA5B587C-6F16-49E9-9169-793CA4AB7C70}
+		{007AD19C-8A80-4463-834C-BE7AE1808A04} = {AA5B587C-6F16-49E9-9169-793CA4AB7C70}
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8} = {42312719-3478-4869-B4ED-19358F167B5F}
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F} = {42312719-3478-4869-B4ED-19358F167B5F}
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42} = {42312719-3478-4869-B4ED-19358F167B5F}
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF} = {42312719-3478-4869-B4ED-19358F167B5F}
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E} = {42312719-3478-4869-B4ED-19358F167B5F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F04B167-A03F-4206-8481-60213C3EF9B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F04B167-A03F-4206-8481-60213C3EF9B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5522BAFC-E2FF-4896-993A-401DDEDFD85F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D7BBD88-739E-472A-9F44-2794049A688F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D7BBD88-739E-472A-9F44-2794049A688F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B51887D-CD24-4BF7-A010-7D45F0ACAAB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B51887D-CD24-4BF7-A010-7D45F0ACAAB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B51887D-CD24-4BF7-A010-7D45F0ACAAB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B51887D-CD24-4BF7-A010-7D45F0ACAAB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Debug|Any CPU.Build.0 = Debug|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Debug|x64.ActiveCfg = Debug|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Debug|x64.Build.0 = Debug|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Debug|x86.ActiveCfg = Debug|x86
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Debug|x86.Build.0 = Debug|x86
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Release|Any CPU.ActiveCfg = Release|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Release|Any CPU.Build.0 = Release|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Release|x64.ActiveCfg = Release|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Release|x64.Build.0 = Release|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Release|x86.ActiveCfg = Release|x86
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Release|x86.Build.0 = Release|x86
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Checked|Any CPU.Build.0 = Checked|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Checked|x64.ActiveCfg = Checked|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Checked|x64.Build.0 = Checked|x64
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Checked|x86.ActiveCfg = Checked|x86
+		{751F6E52-BD51-406F-9EB6-06D3C27BF469}.Checked|x86.Build.0 = Checked|x86
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Debug|x64.Build.0 = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Debug|x86.Build.0 = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Release|x64.ActiveCfg = Release|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Release|x64.Build.0 = Release|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Release|x86.Build.0 = Release|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F9B2FCA3-69C0-45A6-B1FA-E989263536C4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Debug|x64.Build.0 = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Debug|x86.Build.0 = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Release|x64.ActiveCfg = Release|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Release|x64.Build.0 = Release|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Release|x86.ActiveCfg = Release|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Release|x86.Build.0 = Release|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0CB6DDF0-5E65-48F3-BC61-50A1E747CDB8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Release|x64.Build.0 = Release|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Release|x86.Build.0 = Release|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BB689125-CDA7-4CFA-A4D6-1C932092A67F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Debug|x64.Build.0 = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Release|x64.Build.0 = Release|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Release|x86.Build.0 = Release|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1648AC4C-3BEF-4B93-933B-5EC520BF11D5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Debug|x64.Build.0 = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Debug|x86.Build.0 = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Release|x64.ActiveCfg = Release|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Release|x64.Build.0 = Release|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Release|x86.ActiveCfg = Release|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Release|x86.Build.0 = Release|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{007AD19C-8A80-4463-834C-BE7AE1808A04}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x64.Build.0 = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Debug|x86.Build.0 = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x64.ActiveCfg = Release|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x64.Build.0 = Release|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x86.ActiveCfg = Release|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Release|x86.Build.0 = Release|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{68E366F0-A62B-4528-8B26-CDFE17AA9C42}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x64.Build.0 = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Debug|x86.Build.0 = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Release|Any CPU.Build.0 = Release|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x64.ActiveCfg = Release|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x64.Build.0 = Release|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x86.ActiveCfg = Release|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Release|x86.Build.0 = Release|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{207F66C5-1274-445C-B69E-E2C5F0776843}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Release|x64.Build.0 = Release|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Release|x86.Build.0 = Release|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8C2CE6CA-8774-4CE2-9F5A-397C6014A5BF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Release|x64.Build.0 = Release|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Release|x86.Build.0 = Release|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E8C460E4-2874-434B-BCC7-819CFCA7AB1E}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6F04B167-A03F-4206-8481-60213C3EF9B9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5522BAFC-E2FF-4896-993A-401DDEDFD85F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2D7BBD88-739E-472A-9F44-2794049A688F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{2B51887D-CD24-4BF7-A010-7D45F0ACAAB9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D4F47090-6CB5-4B3F-9C3B-F43818041023}
+		SolutionGuid = {E66CC269-DA5B-4970-AAEE-78F703F4EB96}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Buffers/System.Buffers.sln b/src/libraries/System.Buffers/System.Buffers.sln
index c688a86c552770..166ac1588dd3c0 100644
--- a/src/libraries/System.Buffers/System.Buffers.sln
+++ b/src/libraries/System.Buffers/System.Buffers.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Tests", "tests\System.Buffers.Tests.csproj", "{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B} = {2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{006429DB-0860-4688-BD1D-459C9364594D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers", "src\System.Buffers.csproj", "{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456C} = {11AE73F7-3532-47B9-8FF6-B4F22D76456C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{350A679C-F690-49B3-AB97-340AF05E1250}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers", "ref\System.Buffers.csproj", "{11AE73F7-3532-47B9-8FF6-B4F22D76456C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B16700FF-26E8-438A-A724-F906B4C35547}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers", "ref\System.Buffers.csproj", "{7F713B83-1256-4108-B40D-FDD380BB9DB6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers", "src\System.Buffers.csproj", "{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Buffers.Tests", "tests\System.Buffers.Tests.csproj", "{FF86CB73-2E54-4E89-9491-258324F291D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9F56BACD-30E9-469D-AEE1-210EF5D8F658}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DEEF0E72-FB33-419E-862E-3A355B661AF9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{33F30064-A012-4287-88B8-ECA9FBF4A971}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F57EECE2-1672-4152-B2AA-3E76153FDEBE}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{006429DB-0860-4688-BD1D-459C9364594D} = {DEEF0E72-FB33-419E-862E-3A355B661AF9}
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6} = {DEEF0E72-FB33-419E-862E-3A355B661AF9}
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5} = {DEEF0E72-FB33-419E-862E-3A355B661AF9}
+		{350A679C-F690-49B3-AB97-340AF05E1250} = {33F30064-A012-4287-88B8-ECA9FBF4A971}
+		{FF86CB73-2E54-4E89-9491-258324F291D0} = {33F30064-A012-4287-88B8-ECA9FBF4A971}
+		{B16700FF-26E8-438A-A724-F906B4C35547} = {F57EECE2-1672-4152-B2AA-3E76153FDEBE}
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6} = {F57EECE2-1672-4152-B2AA-3E76153FDEBE}
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621} = {F57EECE2-1672-4152-B2AA-3E76153FDEBE}
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB} = {F57EECE2-1672-4152-B2AA-3E76153FDEBE}
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C} = {F57EECE2-1672-4152-B2AA-3E76153FDEBE}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F56BACD-30E9-469D-AEE1-210EF5D8F658}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F56BACD-30E9-469D-AEE1-210EF5D8F658}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F56BACD-30E9-469D-AEE1-210EF5D8F658}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F56BACD-30E9-469D-AEE1-210EF5D8F658}.Release|Any CPU.Build.0 = Release|Any CPU
+		{006429DB-0860-4688-BD1D-459C9364594D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Debug|Any CPU.Build.0 = Debug|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Debug|x64.ActiveCfg = Debug|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Debug|x64.Build.0 = Debug|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Debug|x86.ActiveCfg = Debug|x86
+		{006429DB-0860-4688-BD1D-459C9364594D}.Debug|x86.Build.0 = Debug|x86
+		{006429DB-0860-4688-BD1D-459C9364594D}.Release|Any CPU.ActiveCfg = Release|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Release|Any CPU.Build.0 = Release|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Release|x64.ActiveCfg = Release|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Release|x64.Build.0 = Release|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Release|x86.ActiveCfg = Release|x86
+		{006429DB-0860-4688-BD1D-459C9364594D}.Release|x86.Build.0 = Release|x86
+		{006429DB-0860-4688-BD1D-459C9364594D}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Checked|Any CPU.Build.0 = Checked|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Checked|x64.ActiveCfg = Checked|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Checked|x64.Build.0 = Checked|x64
+		{006429DB-0860-4688-BD1D-459C9364594D}.Checked|x86.ActiveCfg = Checked|x86
+		{006429DB-0860-4688-BD1D-459C9364594D}.Checked|x86.Build.0 = Checked|x86
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Debug|x64.Build.0 = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Debug|x86.Build.0 = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Release|Any CPU.Build.0 = Release|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Release|x64.ActiveCfg = Release|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Release|x64.Build.0 = Release|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Release|x86.ActiveCfg = Release|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Release|x86.Build.0 = Release|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{350A679C-F690-49B3-AB97-340AF05E1250}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Debug|x64.Build.0 = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Debug|x86.Build.0 = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Release|x64.ActiveCfg = Release|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Release|x64.Build.0 = Release|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Release|x86.ActiveCfg = Release|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Release|x86.Build.0 = Release|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B16700FF-26E8-438A-A724-F906B4C35547}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Debug|x64.Build.0 = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Debug|x86.Build.0 = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Release|x64.Build.0 = Release|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Release|x86.Build.0 = Release|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7F713B83-1256-4108-B40D-FDD380BB9DB6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Debug|x64.Build.0 = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Release|x64.ActiveCfg = Release|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Release|x64.Build.0 = Release|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Release|x86.Build.0 = Release|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4BA09CF8-2B90-43E1-AB35-8A48FF8ECEC6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Debug|x64.Build.0 = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Debug|x86.Build.0 = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Release|x64.ActiveCfg = Release|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Release|x64.Build.0 = Release|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Release|x86.Build.0 = Release|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FF86CB73-2E54-4E89-9491-258324F291D0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x64.Build.0 = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Debug|x86.Build.0 = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x64.ActiveCfg = Release|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x64.Build.0 = Release|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x86.ActiveCfg = Release|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Release|x86.Build.0 = Release|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3EA59DDB-E3E9-4CA0-9FDF-3659C0CD4621}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x64.Build.0 = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Debug|x86.Build.0 = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x64.ActiveCfg = Release|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x64.Build.0 = Release|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x86.ActiveCfg = Release|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Release|x86.Build.0 = Release|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5368CFB4-8C6C-4350-9FF0-2FFCB1912AB5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Debug|x64.Build.0 = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Debug|x86.Build.0 = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Release|x64.ActiveCfg = Release|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Release|x64.Build.0 = Release|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Release|x86.ActiveCfg = Release|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Release|x86.Build.0 = Release|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F560AE7E-DC82-4F1B-A06F-47112BEF31CB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Debug|x64.Build.0 = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Debug|x86.Build.0 = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Release|x64.ActiveCfg = Release|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Release|x64.Build.0 = Release|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Release|x86.ActiveCfg = Release|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Release|x86.Build.0 = Release|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CCB43103-0346-468A-BAEC-E4EBA3D05B7C}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{62E2AD5F-C8D0-45FB-B6A5-AED2C77F198C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9F56BACD-30E9-469D-AEE1-210EF5D8F658} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D6CF83FE-C3D4-4A79-AF98-CF4037328049}
+		SolutionGuid = {FEF31CDB-D5C9-401F-BBBA-DFAF9CF6181B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.CodeDom/System.CodeDom.sln b/src/libraries/System.CodeDom/System.CodeDom.sln
index ea9dbd9dec678e..375c64b5565353 100644
--- a/src/libraries/System.CodeDom/System.CodeDom.sln
+++ b/src/libraries/System.CodeDom/System.CodeDom.sln
@@ -1,60 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom.Tests", "tests\System.CodeDom.Tests.csproj", "{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}"
-	ProjectSection(ProjectDependencies) = postProject
-		{53D09AF4-0C13-4197-B8AD-9746F0374E88} = {53D09AF4-0C13-4197-B8AD-9746F0374E88}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A83DE19F-4E19-4FEE-A3D7-FBA9E065B186}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "src\System.CodeDom.csproj", "{53D09AF4-0C13-4197-B8AD-9746F0374E88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4CF42F1E-B5AC-4834-AE24-A1F285091377} = {4CF42F1E-B5AC-4834-AE24-A1F285091377}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{07594579-A029-44C1-A96D-63ECD8E81A54}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "ref\System.CodeDom.csproj", "{4CF42F1E-B5AC-4834-AE24-A1F285091377}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "ref\System.CodeDom.csproj", "{74AE27CF-E940-4EEB-9A19-0968689B627E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "src\System.CodeDom.csproj", "{14D5A803-D5BF-44E5-B2B5-0B0BC297748E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom.Tests", "tests\System.CodeDom.Tests.csproj", "{627FFEFC-A317-4AD1-809F-B26CA7F475BD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{8B41F4FA-C804-4769-BDF0-467972E33997}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{692196BB-CC1D-4D6D-833C-D229E3E3ADB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A034C285-3898-4F28-AB63-1023FBD4D9C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1CE2BCE6-C05C-4C33-BB02-3CFBB6423A66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{F5C1865E-F81C-4041-8AFA-762C4422E419}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{1B6EBC9E-060D-4838-8894-55399F243BA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5CDC4443-9032-43B2-9764-C1B829E04B03}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6A204C90-1130-4C38-9CED-E220D1874265}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{20580E25-2331-4A20-8BDB-1D647CCE4EB7}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A83DE19F-4E19-4FEE-A3D7-FBA9E065B186} = {5CDC4443-9032-43B2-9764-C1B829E04B03}
+		{627FFEFC-A317-4AD1-809F-B26CA7F475BD} = {5CDC4443-9032-43B2-9764-C1B829E04B03}
+		{07594579-A029-44C1-A96D-63ECD8E81A54} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{74AE27CF-E940-4EEB-9A19-0968689B627E} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{8B41F4FA-C804-4769-BDF0-467972E33997} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{A034C285-3898-4F28-AB63-1023FBD4D9C8} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{1CE2BCE6-C05C-4C33-BB02-3CFBB6423A66} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{F5C1865E-F81C-4041-8AFA-762C4422E419} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{1B6EBC9E-060D-4838-8894-55399F243BA1} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C} = {6A204C90-1130-4C38-9CED-E220D1874265}
+		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E} = {20580E25-2331-4A20-8BDB-1D647CCE4EB7}
+		{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4} = {20580E25-2331-4A20-8BDB-1D647CCE4EB7}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A726}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53D09AF4-0C13-4197-B8AD-9746F0374E88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4CF42F1E-B5AC-4834-AE24-A1F285091377}.Release|Any CPU.Build.0 = Release|Any CPU
-		{692196BB-CC1D-4D6D-833C-D229E3E3ADB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{692196BB-CC1D-4D6D-833C-D229E3E3ADB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{692196BB-CC1D-4D6D-833C-D229E3E3ADB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{692196BB-CC1D-4D6D-833C-D229E3E3ADB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A83DE19F-4E19-4FEE-A3D7-FBA9E065B186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A83DE19F-4E19-4FEE-A3D7-FBA9E065B186}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A83DE19F-4E19-4FEE-A3D7-FBA9E065B186}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A83DE19F-4E19-4FEE-A3D7-FBA9E065B186}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07594579-A029-44C1-A96D-63ECD8E81A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07594579-A029-44C1-A96D-63ECD8E81A54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07594579-A029-44C1-A96D-63ECD8E81A54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07594579-A029-44C1-A96D-63ECD8E81A54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74AE27CF-E940-4EEB-9A19-0968689B627E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74AE27CF-E940-4EEB-9A19-0968689B627E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74AE27CF-E940-4EEB-9A19-0968689B627E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74AE27CF-E940-4EEB-9A19-0968689B627E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14D5A803-D5BF-44E5-B2B5-0B0BC297748E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{627FFEFC-A317-4AD1-809F-B26CA7F475BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{627FFEFC-A317-4AD1-809F-B26CA7F475BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{627FFEFC-A317-4AD1-809F-B26CA7F475BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{627FFEFC-A317-4AD1-809F-B26CA7F475BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B41F4FA-C804-4769-BDF0-467972E33997}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B41F4FA-C804-4769-BDF0-467972E33997}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B41F4FA-C804-4769-BDF0-467972E33997}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B41F4FA-C804-4769-BDF0-467972E33997}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A034C285-3898-4F28-AB63-1023FBD4D9C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A034C285-3898-4F28-AB63-1023FBD4D9C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A034C285-3898-4F28-AB63-1023FBD4D9C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A034C285-3898-4F28-AB63-1023FBD4D9C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0C094F6-F35D-46DB-BD74-CE1FC1FC93C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CE2BCE6-C05C-4C33-BB02-3CFBB6423A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CE2BCE6-C05C-4C33-BB02-3CFBB6423A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CE2BCE6-C05C-4C33-BB02-3CFBB6423A66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CE2BCE6-C05C-4C33-BB02-3CFBB6423A66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5C1865E-F81C-4041-8AFA-762C4422E419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5C1865E-F81C-4041-8AFA-762C4422E419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5C1865E-F81C-4041-8AFA-762C4422E419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5C1865E-F81C-4041-8AFA-762C4422E419}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B6EBC9E-060D-4838-8894-55399F243BA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B6EBC9E-060D-4838-8894-55399F243BA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B6EBC9E-060D-4838-8894-55399F243BA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B6EBC9E-060D-4838-8894-55399F243BA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7D7C449-65F5-4B0F-94F1-2CA6EDDACD5C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0D1E2954-A5C7-4B8C-932A-31EB4A96A726} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{53D09AF4-0C13-4197-B8AD-9746F0374E88} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4CF42F1E-B5AC-4834-AE24-A1F285091377} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{692196BB-CC1D-4D6D-833C-D229E3E3ADB8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {760BBC5B-7FAC-4F92-BAEC-0C02486CD300}
+		SolutionGuid = {70EC5780-3C80-4D52-93B0-7FBF64E29572}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
index b9c4a15d3d9482..8c31f04ca89413 100644
--- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
+++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln
@@ -1,74 +1,267 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent.Tests", "tests\System.Collections.Concurrent.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "src\System.Collections.Concurrent.csproj", "{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}"
-	ProjectSection(ProjectDependencies) = postProject
-		{772CB0A7-3D45-4D3A-B975-671A1937C761} = {772CB0A7-3D45-4D3A-B975-671A1937C761}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "ref\System.Collections.Concurrent.csproj", "{772CB0A7-3D45-4D3A-B975-671A1937C761}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "ref\System.Collections.Concurrent.csproj", "{ADA6D062-1E28-47D8-A058-FE1F4551AA20}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "src\System.Collections.Concurrent.csproj", "{BFA1A52C-48B4-45C7-8595-B98236A11ED1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent.Tests", "tests\System.Collections.Concurrent.Tests.csproj", "{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{91BAC0C0-2F64-4346-87AC-94DAB6911F5B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{34C59132-692C-45D7-87BD-869A18F09E2C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "..\System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj", "{541D25E4-A6F4-4189-AD42-14D31DEF4EB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "..\System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj", "{93FB3527-B9E6-4ECA-8F36-56835F4F9236}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{F8C58AD9-D9EA-4BBC-AB6E-E908007F607E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1D4FEFF5-24CC-4725-90CD-651D389C0961}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A27E93BA-7A0C-417E-B178-F1727D50B7FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{EAC28D44-B88D-4631-A698-EA57EBF0B49D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{40AC202B-76E9-40BF-9411-4A617AF0EBD9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1E3679C8-EEB4-4D38-BC04-AD33CF997804}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A48623BD-6556-4B22-B925-11BCB380392C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{11C95B67-128C-420E-8DB7-10040810ED3F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322} = {1E3679C8-EEB4-4D38-BC04-AD33CF997804}
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1} = {1E3679C8-EEB4-4D38-BC04-AD33CF997804}
+		{34C59132-692C-45D7-87BD-869A18F09E2C} = {1E3679C8-EEB4-4D38-BC04-AD33CF997804}
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236} = {1E3679C8-EEB4-4D38-BC04-AD33CF997804}
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF} = {1E3679C8-EEB4-4D38-BC04-AD33CF997804}
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2} = {1E3679C8-EEB4-4D38-BC04-AD33CF997804}
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46} = {A48623BD-6556-4B22-B925-11BCB380392C}
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8} = {A48623BD-6556-4B22-B925-11BCB380392C}
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20} = {11C95B67-128C-420E-8DB7-10040810ED3F}
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20} = {11C95B67-128C-420E-8DB7-10040810ED3F}
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961} = {11C95B67-128C-420E-8DB7-10040810ED3F}
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D} = {11C95B67-128C-420E-8DB7-10040810ED3F}
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9} = {11C95B67-128C-420E-8DB7-10040810ED3F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{772CB0A7-3D45-4D3A-B975-671A1937C761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{772CB0A7-3D45-4D3A-B975-671A1937C761}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{772CB0A7-3D45-4D3A-B975-671A1937C761}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{772CB0A7-3D45-4D3A-B975-671A1937C761}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91BAC0C0-2F64-4346-87AC-94DAB6911F5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91BAC0C0-2F64-4346-87AC-94DAB6911F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91BAC0C0-2F64-4346-87AC-94DAB6911F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91BAC0C0-2F64-4346-87AC-94DAB6911F5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{541D25E4-A6F4-4189-AD42-14D31DEF4EB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{541D25E4-A6F4-4189-AD42-14D31DEF4EB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{541D25E4-A6F4-4189-AD42-14D31DEF4EB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{541D25E4-A6F4-4189-AD42-14D31DEF4EB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8C58AD9-D9EA-4BBC-AB6E-E908007F607E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8C58AD9-D9EA-4BBC-AB6E-E908007F607E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8C58AD9-D9EA-4BBC-AB6E-E908007F607E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8C58AD9-D9EA-4BBC-AB6E-E908007F607E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Debug|Any CPU.Build.0 = Debug|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Debug|x64.ActiveCfg = Debug|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Debug|x64.Build.0 = Debug|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Debug|x86.ActiveCfg = Debug|x86
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Debug|x86.Build.0 = Debug|x86
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Release|Any CPU.ActiveCfg = Release|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Release|Any CPU.Build.0 = Release|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Release|x64.ActiveCfg = Release|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Release|x64.Build.0 = Release|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Release|x86.ActiveCfg = Release|x86
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Release|x86.Build.0 = Release|x86
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Checked|Any CPU.Build.0 = Checked|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Checked|x64.ActiveCfg = Checked|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Checked|x64.Build.0 = Checked|x64
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Checked|x86.ActiveCfg = Checked|x86
+		{A8E6D68A-AFEE-4B68-ACE1-074CD1BCC322}.Checked|x86.Build.0 = Checked|x86
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Debug|x86.Build.0 = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Release|x64.Build.0 = Release|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Release|x86.Build.0 = Release|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7C2B8279-F7BB-4AD4-BA44-B9071090AF46}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Debug|x64.Build.0 = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Debug|x86.Build.0 = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Release|x64.ActiveCfg = Release|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Release|x64.Build.0 = Release|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Release|x86.ActiveCfg = Release|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Release|x86.Build.0 = Release|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{30A069D8-F71A-4F5E-92C0-A4C7AD40BB20}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Debug|x64.Build.0 = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Debug|x86.Build.0 = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Release|x64.ActiveCfg = Release|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Release|x64.Build.0 = Release|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Release|x86.ActiveCfg = Release|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Release|x86.Build.0 = Release|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ADA6D062-1E28-47D8-A058-FE1F4551AA20}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Debug|x64.Build.0 = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Debug|x86.Build.0 = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Release|x64.ActiveCfg = Release|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Release|x64.Build.0 = Release|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Release|x86.ActiveCfg = Release|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Release|x86.Build.0 = Release|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BFA1A52C-48B4-45C7-8595-B98236A11ED1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Debug|x86.Build.0 = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Release|x64.Build.0 = Release|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Release|x86.Build.0 = Release|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C391ADBE-DD23-4F4A-B3EC-011974CC6CE8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Debug|x64.Build.0 = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Debug|x86.Build.0 = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Release|x64.ActiveCfg = Release|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Release|x64.Build.0 = Release|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Release|x86.ActiveCfg = Release|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Release|x86.Build.0 = Release|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{34C59132-692C-45D7-87BD-869A18F09E2C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Debug|x64.Build.0 = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Debug|x86.Build.0 = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Release|x64.ActiveCfg = Release|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Release|x64.Build.0 = Release|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Release|x86.ActiveCfg = Release|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Release|x86.Build.0 = Release|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{93FB3527-B9E6-4ECA-8F36-56835F4F9236}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x64.Build.0 = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Debug|x86.Build.0 = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x64.ActiveCfg = Release|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x64.Build.0 = Release|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x86.ActiveCfg = Release|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Release|x86.Build.0 = Release|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1D4FEFF5-24CC-4725-90CD-651D389C0961}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x64.Build.0 = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Debug|x86.Build.0 = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x64.ActiveCfg = Release|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x64.Build.0 = Release|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x86.ActiveCfg = Release|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Release|x86.Build.0 = Release|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A27E93BA-7A0C-417E-B178-F1727D50B7FF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Debug|x64.Build.0 = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Debug|x86.Build.0 = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Release|x64.ActiveCfg = Release|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Release|x64.Build.0 = Release|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Release|x86.ActiveCfg = Release|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Release|x86.Build.0 = Release|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EAC28D44-B88D-4631-A698-EA57EBF0B49D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Debug|x64.Build.0 = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Debug|x86.Build.0 = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Release|x64.ActiveCfg = Release|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Release|x64.Build.0 = Release|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Release|x86.ActiveCfg = Release|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Release|x86.Build.0 = Release|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{40AC202B-76E9-40BF-9411-4A617AF0EBD9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Release|x64.Build.0 = Release|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Release|x86.Build.0 = Release|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FA6BD4D3-8D9B-4CA2-B8C6-A1A21F946AC2}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9574CEEC-5554-411B-B44C-6CA9EC1CEB08} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{772CB0A7-3D45-4D3A-B975-671A1937C761} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{91BAC0C0-2F64-4346-87AC-94DAB6911F5B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{541D25E4-A6F4-4189-AD42-14D31DEF4EB7} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F8C58AD9-D9EA-4BBC-AB6E-E908007F607E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {87704D28-6290-402F-9B93-DE67CE2E3D06}
+		SolutionGuid = {1A4F1A4C-4F4F-4E0C-9342-4B32674E2F00}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
index 463b2a4999e0ef..ad5ed2bc5d4226 100644
--- a/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
+++ b/src/libraries/System.Collections.Immutable/System.Collections.Immutable.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable.Tests", "tests\System.Collections.Immutable.Tests.csproj", "{95DFC527-4DC1-495E-97D7-E94EE1F7140D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1DD0FF15-6234-4BD6-850A-317F05479554} = {1DD0FF15-6234-4BD6-850A-317F05479554}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{16338C21-1631-400F-951B-F501F2AB99DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "src\System.Collections.Immutable.csproj", "{1DD0FF15-6234-4BD6-850A-317F05479554}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7EFF4EE-70DC-453B-B817-4AF67921AB03} = {C7EFF4EE-70DC-453B-B817-4AF67921AB03}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{EB3278CE-5E5E-46C6-8759-465615AC3FB9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "ref\System.Collections.Immutable.csproj", "{C7EFF4EE-70DC-453B-B817-4AF67921AB03}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "ref\System.Collections.Immutable.csproj", "{1514371B-8161-4A27-AD96-30E3F9EA7AAE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "src\System.Collections.Immutable.csproj", "{F9520C8A-A85B-4AB0-8535-D1F2124DAC76}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable.Tests", "tests\System.Collections.Immutable.Tests.csproj", "{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C37D857D-7377-47C9-88BA-02A932A83D03}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8DE08644-1FCE-4268-9D33-041F19643ADA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E77ED886-F412-462A-865A-B1A668651BEF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{06A060CF-80E8-4080-8F38-50788151DAFA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F966BE39-B481-4998-9F56-F2324A177998}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{78F08F61-F550-4694-A4B6-A404DE9A6284}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D025A868-F58D-4ECC-9516-26CEB02F1DF6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{16338C21-1631-400F-951B-F501F2AB99DB} = {F966BE39-B481-4998-9F56-F2324A177998}
+		{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7} = {F966BE39-B481-4998-9F56-F2324A177998}
+		{EB3278CE-5E5E-46C6-8759-465615AC3FB9} = {78F08F61-F550-4694-A4B6-A404DE9A6284}
+		{1514371B-8161-4A27-AD96-30E3F9EA7AAE} = {78F08F61-F550-4694-A4B6-A404DE9A6284}
+		{C37D857D-7377-47C9-88BA-02A932A83D03} = {78F08F61-F550-4694-A4B6-A404DE9A6284}
+		{E77ED886-F412-462A-865A-B1A668651BEF} = {78F08F61-F550-4694-A4B6-A404DE9A6284}
+		{06A060CF-80E8-4080-8F38-50788151DAFA} = {78F08F61-F550-4694-A4B6-A404DE9A6284}
+		{F9520C8A-A85B-4AB0-8535-D1F2124DAC76} = {D025A868-F58D-4ECC-9516-26CEB02F1DF6}
+		{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938} = {D025A868-F58D-4ECC-9516-26CEB02F1DF6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1DD0FF15-6234-4BD6-850A-317F05479554}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1DD0FF15-6234-4BD6-850A-317F05479554}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7EFF4EE-70DC-453B-B817-4AF67921AB03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DE08644-1FCE-4268-9D33-041F19643ADA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DE08644-1FCE-4268-9D33-041F19643ADA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DE08644-1FCE-4268-9D33-041F19643ADA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DE08644-1FCE-4268-9D33-041F19643ADA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16338C21-1631-400F-951B-F501F2AB99DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16338C21-1631-400F-951B-F501F2AB99DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16338C21-1631-400F-951B-F501F2AB99DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16338C21-1631-400F-951B-F501F2AB99DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB3278CE-5E5E-46C6-8759-465615AC3FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB3278CE-5E5E-46C6-8759-465615AC3FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB3278CE-5E5E-46C6-8759-465615AC3FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB3278CE-5E5E-46C6-8759-465615AC3FB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1514371B-8161-4A27-AD96-30E3F9EA7AAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1514371B-8161-4A27-AD96-30E3F9EA7AAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1514371B-8161-4A27-AD96-30E3F9EA7AAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1514371B-8161-4A27-AD96-30E3F9EA7AAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9520C8A-A85B-4AB0-8535-D1F2124DAC76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9520C8A-A85B-4AB0-8535-D1F2124DAC76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9520C8A-A85B-4AB0-8535-D1F2124DAC76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9520C8A-A85B-4AB0-8535-D1F2124DAC76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70EA8239-58B9-44E5-B1C5-ABEC2C9066E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C37D857D-7377-47C9-88BA-02A932A83D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C37D857D-7377-47C9-88BA-02A932A83D03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C37D857D-7377-47C9-88BA-02A932A83D03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C37D857D-7377-47C9-88BA-02A932A83D03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5810ECAB-BA2C-48D1-9D2E-D7C3E6F83938}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E77ED886-F412-462A-865A-B1A668651BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E77ED886-F412-462A-865A-B1A668651BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E77ED886-F412-462A-865A-B1A668651BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E77ED886-F412-462A-865A-B1A668651BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06A060CF-80E8-4080-8F38-50788151DAFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06A060CF-80E8-4080-8F38-50788151DAFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06A060CF-80E8-4080-8F38-50788151DAFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06A060CF-80E8-4080-8F38-50788151DAFA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{95DFC527-4DC1-495E-97D7-E94EE1F7140D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1DD0FF15-6234-4BD6-850A-317F05479554} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C7EFF4EE-70DC-453B-B817-4AF67921AB03} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{8DE08644-1FCE-4268-9D33-041F19643ADA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1DE2A735-672B-42B4-BD77-CE7B1976CC52}
+		SolutionGuid = {62498458-77B4-4070-87BB-09F22AC54239}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
index 5a05e434fca511..cd0895c0a5279b 100644
--- a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
+++ b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric.Tests", "tests\System.Collections.NonGeneric.Tests.csproj", "{EE95AE39-845A-42D3-86D0-8065DBE56612}"
-	ProjectSection(ProjectDependencies) = postProject
-		{585E3764-534B-4A12-8BD5-8578CB826A45} = {585E3764-534B-4A12-8BD5-8578CB826A45}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8844EF4B-CE0F-4E76-B97B-4844B33CB3FB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "src\System.Collections.NonGeneric.csproj", "{585E3764-534B-4A12-8BD5-8578CB826A45}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8500112F-96BD-47BF-8871-3242089FAE70} = {8500112F-96BD-47BF-8871-3242089FAE70}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{49F24282-7299-41E4-9C9E-481741B2A1B9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "ref\System.Collections.NonGeneric.csproj", "{8500112F-96BD-47BF-8871-3242089FAE70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "ref\System.Collections.NonGeneric.csproj", "{D3B134E9-5B26-4455-9F2D-22302BD8E350}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "src\System.Collections.NonGeneric.csproj", "{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric.Tests", "tests\System.Collections.NonGeneric.Tests.csproj", "{AF7C053E-2774-4355-8541-945594C4AF9C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{31A285E0-CBFF-46D1-84BC-312ABEB35A4F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B0759A15-7D28-496D-90C9-406F9C0ACEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{6186F0B4-B044-40FD-8397-B47EADA616F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{FD6EBEAC-0D3F-4C20-B547-0B91DCBA5C30}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{46A14EE9-6DEA-433B-83E9-6EF79C3EFD71}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4D4E7926-6B35-45A3-9511-2FE054D5A90A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E598645-46EC-44E2-B49B-DCA3153A0656}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8844EF4B-CE0F-4E76-B97B-4844B33CB3FB} = {46A14EE9-6DEA-433B-83E9-6EF79C3EFD71}
+		{AF7C053E-2774-4355-8541-945594C4AF9C} = {46A14EE9-6DEA-433B-83E9-6EF79C3EFD71}
+		{49F24282-7299-41E4-9C9E-481741B2A1B9} = {4D4E7926-6B35-45A3-9511-2FE054D5A90A}
+		{D3B134E9-5B26-4455-9F2D-22302BD8E350} = {4D4E7926-6B35-45A3-9511-2FE054D5A90A}
+		{31A285E0-CBFF-46D1-84BC-312ABEB35A4F} = {4D4E7926-6B35-45A3-9511-2FE054D5A90A}
+		{6186F0B4-B044-40FD-8397-B47EADA616F9} = {4D4E7926-6B35-45A3-9511-2FE054D5A90A}
+		{FD6EBEAC-0D3F-4C20-B547-0B91DCBA5C30} = {4D4E7926-6B35-45A3-9511-2FE054D5A90A}
+		{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2} = {5E598645-46EC-44E2-B49B-DCA3153A0656}
+		{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD} = {5E598645-46EC-44E2-B49B-DCA3153A0656}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE95AE39-845A-42D3-86D0-8065DBE56612}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE95AE39-845A-42D3-86D0-8065DBE56612}.Release|Any CPU.Build.0 = Release|Any CPU
-		{585E3764-534B-4A12-8BD5-8578CB826A45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{585E3764-534B-4A12-8BD5-8578CB826A45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{585E3764-534B-4A12-8BD5-8578CB826A45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{585E3764-534B-4A12-8BD5-8578CB826A45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8500112F-96BD-47BF-8871-3242089FAE70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8500112F-96BD-47BF-8871-3242089FAE70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8500112F-96BD-47BF-8871-3242089FAE70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8500112F-96BD-47BF-8871-3242089FAE70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0759A15-7D28-496D-90C9-406F9C0ACEFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0759A15-7D28-496D-90C9-406F9C0ACEFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0759A15-7D28-496D-90C9-406F9C0ACEFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0759A15-7D28-496D-90C9-406F9C0ACEFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8844EF4B-CE0F-4E76-B97B-4844B33CB3FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8844EF4B-CE0F-4E76-B97B-4844B33CB3FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8844EF4B-CE0F-4E76-B97B-4844B33CB3FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8844EF4B-CE0F-4E76-B97B-4844B33CB3FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49F24282-7299-41E4-9C9E-481741B2A1B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49F24282-7299-41E4-9C9E-481741B2A1B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49F24282-7299-41E4-9C9E-481741B2A1B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49F24282-7299-41E4-9C9E-481741B2A1B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3B134E9-5B26-4455-9F2D-22302BD8E350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3B134E9-5B26-4455-9F2D-22302BD8E350}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3B134E9-5B26-4455-9F2D-22302BD8E350}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3B134E9-5B26-4455-9F2D-22302BD8E350}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B963C6C-CF59-433B-B8FB-6C1EB4650DF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF7C053E-2774-4355-8541-945594C4AF9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF7C053E-2774-4355-8541-945594C4AF9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF7C053E-2774-4355-8541-945594C4AF9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF7C053E-2774-4355-8541-945594C4AF9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31A285E0-CBFF-46D1-84BC-312ABEB35A4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C80ABA38-B1E9-4050-8F9B-B04CDC959EFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6186F0B4-B044-40FD-8397-B47EADA616F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6186F0B4-B044-40FD-8397-B47EADA616F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6186F0B4-B044-40FD-8397-B47EADA616F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6186F0B4-B044-40FD-8397-B47EADA616F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD6EBEAC-0D3F-4C20-B547-0B91DCBA5C30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD6EBEAC-0D3F-4C20-B547-0B91DCBA5C30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD6EBEAC-0D3F-4C20-B547-0B91DCBA5C30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD6EBEAC-0D3F-4C20-B547-0B91DCBA5C30}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EE95AE39-845A-42D3-86D0-8065DBE56612} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{585E3764-534B-4A12-8BD5-8578CB826A45} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{8500112F-96BD-47BF-8871-3242089FAE70} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{B0759A15-7D28-496D-90C9-406F9C0ACEFD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BB734161-A529-4414-A97C-AEB61EC87D48}
+		SolutionGuid = {42E679A9-01B2-446F-B26E-4CF16464E149}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
index 68c8963d9f6463..739c15cb324ed5 100644
--- a/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
+++ b/src/libraries/System.Collections.Specialized/System.Collections.Specialized.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized.Tests", "tests\System.Collections.Specialized.Tests.csproj", "{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}"
-	ProjectSection(ProjectDependencies) = postProject
-		{63634289-90D7-4947-8BF3-DBBE98D76C85} = {63634289-90D7-4947-8BF3-DBBE98D76C85}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "src\System.Collections.Specialized.csproj", "{63634289-90D7-4947-8BF3-DBBE98D76C85}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959} = {6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{90F093C0-0C49-4146-AD5D-0C6A6547A258}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "ref\System.Collections.Specialized.csproj", "{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "ref\System.Collections.Specialized.csproj", "{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "src\System.Collections.Specialized.csproj", "{FE0B5511-A5E1-4E19-A232-B89F628C417E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized.Tests", "tests\System.Collections.Specialized.Tests.csproj", "{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8BFB50AF-BD65-489C-B77F-A0840982FC04}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DCF011C9-211F-498B-93A7-DBCEB552E343}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{89284892-6E2A-4D68-B60B-AA01BF45E38E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{735E08A8-F52E-47A8-85B9-1E45A9422A32}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F6527468-9047-4313-8E53-C6DB7473C86A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{560355F9-6300-4BCB-AD28-0B981A4FD483}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FAE41228-724A-4A5F-ADEF-247C5A641D8E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18} = {F6527468-9047-4313-8E53-C6DB7473C86A}
+		{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3} = {F6527468-9047-4313-8E53-C6DB7473C86A}
+		{90F093C0-0C49-4146-AD5D-0C6A6547A258} = {560355F9-6300-4BCB-AD28-0B981A4FD483}
+		{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D} = {560355F9-6300-4BCB-AD28-0B981A4FD483}
+		{8BFB50AF-BD65-489C-B77F-A0840982FC04} = {560355F9-6300-4BCB-AD28-0B981A4FD483}
+		{89284892-6E2A-4D68-B60B-AA01BF45E38E} = {560355F9-6300-4BCB-AD28-0B981A4FD483}
+		{735E08A8-F52E-47A8-85B9-1E45A9422A32} = {560355F9-6300-4BCB-AD28-0B981A4FD483}
+		{FE0B5511-A5E1-4E19-A232-B89F628C417E} = {FAE41228-724A-4A5F-ADEF-247C5A641D8E}
+		{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C} = {FAE41228-724A-4A5F-ADEF-247C5A641D8E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63634289-90D7-4947-8BF3-DBBE98D76C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63634289-90D7-4947-8BF3-DBBE98D76C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63634289-90D7-4947-8BF3-DBBE98D76C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63634289-90D7-4947-8BF3-DBBE98D76C85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DCF011C9-211F-498B-93A7-DBCEB552E343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCF011C9-211F-498B-93A7-DBCEB552E343}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCF011C9-211F-498B-93A7-DBCEB552E343}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCF011C9-211F-498B-93A7-DBCEB552E343}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D9AEA48-C9C5-42EE-9FF1-A27B9973EE18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90F093C0-0C49-4146-AD5D-0C6A6547A258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90F093C0-0C49-4146-AD5D-0C6A6547A258}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90F093C0-0C49-4146-AD5D-0C6A6547A258}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90F093C0-0C49-4146-AD5D-0C6A6547A258}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D414DDBE-F5D9-4030-A576-DA2CBC96EB5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE0B5511-A5E1-4E19-A232-B89F628C417E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE0B5511-A5E1-4E19-A232-B89F628C417E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE0B5511-A5E1-4E19-A232-B89F628C417E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE0B5511-A5E1-4E19-A232-B89F628C417E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6708616F-5AFD-4AF1-B04E-81EAC42F2EB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8BFB50AF-BD65-489C-B77F-A0840982FC04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8BFB50AF-BD65-489C-B77F-A0840982FC04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8BFB50AF-BD65-489C-B77F-A0840982FC04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8BFB50AF-BD65-489C-B77F-A0840982FC04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A29B4AED-EDEE-48B5-BA13-7F4D06E85D1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89284892-6E2A-4D68-B60B-AA01BF45E38E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89284892-6E2A-4D68-B60B-AA01BF45E38E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89284892-6E2A-4D68-B60B-AA01BF45E38E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89284892-6E2A-4D68-B60B-AA01BF45E38E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{735E08A8-F52E-47A8-85B9-1E45A9422A32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{735E08A8-F52E-47A8-85B9-1E45A9422A32}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{735E08A8-F52E-47A8-85B9-1E45A9422A32}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{735E08A8-F52E-47A8-85B9-1E45A9422A32}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7F5F5134-00FE-4DE8-B20C-3DA8BA2EBA68} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{63634289-90D7-4947-8BF3-DBBE98D76C85} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{6D2FA7D7-1A71-456C-ACBC-1FF13E0E8959} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{DCF011C9-211F-498B-93A7-DBCEB552E343} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3E0D43D8-EF4B-4DF6-9F8D-61BCEF7F85F4}
+		SolutionGuid = {BF9E2841-822A-4FDC-B8C5-AF262BB721D6}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln
index c83b6b4dd0c56b..4a97408e014efb 100644
--- a/src/libraries/System.Collections/System.Collections.sln
+++ b/src/libraries/System.Collections/System.Collections.sln
@@ -1,67 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Tests", "tests\System.Collections.Tests.csproj", "{F5EB9630-AD29-4880-963F-F2D39C684D8A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{4385739F-14A1-4F21-96E3-12EA90580575}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "src\System.Collections.csproj", "{D5FF747F-7A0B-9003-885A-FE9A63E755E5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C746D448-E7C3-4850-9CA7-D3F1FA49742F} = {C746D448-E7C3-4850-9CA7-D3F1FA49742F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{38D8F258-655E-459B-B2CE-0DED144AFBF7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "ref\System.Collections.csproj", "{C746D448-E7C3-4850-9CA7-D3F1FA49742F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0B74A606-CA5C-41BD-BF11-06313111C467}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "ref\System.Collections.csproj", "{77E9C47D-4AC4-4402-8613-40DF427174BD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "src\System.Collections.csproj", "{DF501250-4105-4F79-A508-90B3A13A975A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Tests", "tests\System.Collections.Tests.csproj", "{BB54ED9D-FF71-4D91-B7C0-984AB0976798}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{BE45BF34-779D-4E14-9DD7-FD86E6EDC81E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{DFC77569-7EAD-4C2B-840D-3A58847A2962}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2BB60758-1685-4FA8-B11E-75627B29F66A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EE6AF63D-8705-487B-959B-49FC2D499468}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7F92531-08CA-46EA-B042-C3BF2D1C08CE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{894618AB-CCB7-43BA-8C26-2CBF51C412F5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0C96B731-560C-4703-9077-8B2E37381EF0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{4385739F-14A1-4F21-96E3-12EA90580575} = {D7F92531-08CA-46EA-B042-C3BF2D1C08CE}
+		{DF501250-4105-4F79-A508-90B3A13A975A} = {D7F92531-08CA-46EA-B042-C3BF2D1C08CE}
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6} = {D7F92531-08CA-46EA-B042-C3BF2D1C08CE}
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7} = {894618AB-CCB7-43BA-8C26-2CBF51C412F5}
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798} = {894618AB-CCB7-43BA-8C26-2CBF51C412F5}
+		{0B74A606-CA5C-41BD-BF11-06313111C467} = {0C96B731-560C-4703-9077-8B2E37381EF0}
+		{77E9C47D-4AC4-4402-8613-40DF427174BD} = {0C96B731-560C-4703-9077-8B2E37381EF0}
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3} = {0C96B731-560C-4703-9077-8B2E37381EF0}
+		{2BB60758-1685-4FA8-B11E-75627B29F66A} = {0C96B731-560C-4703-9077-8B2E37381EF0}
+		{EE6AF63D-8705-487B-959B-49FC2D499468} = {0C96B731-560C-4703-9077-8B2E37381EF0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5EB9630-AD29-4880-963F-F2D39C684D8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5FF747F-7A0B-9003-885A-FE9A63E755E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C746D448-E7C3-4850-9CA7-D3F1FA49742F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE45BF34-779D-4E14-9DD7-FD86E6EDC81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE45BF34-779D-4E14-9DD7-FD86E6EDC81E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE45BF34-779D-4E14-9DD7-FD86E6EDC81E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE45BF34-779D-4E14-9DD7-FD86E6EDC81E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFC77569-7EAD-4C2B-840D-3A58847A2962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFC77569-7EAD-4C2B-840D-3A58847A2962}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFC77569-7EAD-4C2B-840D-3A58847A2962}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFC77569-7EAD-4C2B-840D-3A58847A2962}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Debug|Any CPU.Build.0 = Debug|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Debug|x64.ActiveCfg = Debug|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Debug|x64.Build.0 = Debug|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Debug|x86.ActiveCfg = Debug|x86
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Debug|x86.Build.0 = Debug|x86
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Release|Any CPU.ActiveCfg = Release|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Release|Any CPU.Build.0 = Release|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Release|x64.ActiveCfg = Release|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Release|x64.Build.0 = Release|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Release|x86.ActiveCfg = Release|x86
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Release|x86.Build.0 = Release|x86
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Checked|Any CPU.Build.0 = Checked|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Checked|x64.ActiveCfg = Checked|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Checked|x64.Build.0 = Checked|x64
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Checked|x86.ActiveCfg = Checked|x86
+		{4385739F-14A1-4F21-96E3-12EA90580575}.Checked|x86.Build.0 = Checked|x86
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Debug|x64.Build.0 = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Debug|x86.Build.0 = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Release|x64.ActiveCfg = Release|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Release|x64.Build.0 = Release|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Release|x86.Build.0 = Release|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{38D8F258-655E-459B-B2CE-0DED144AFBF7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Debug|x64.Build.0 = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Debug|x86.Build.0 = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Release|x64.ActiveCfg = Release|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Release|x64.Build.0 = Release|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Release|x86.ActiveCfg = Release|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Release|x86.Build.0 = Release|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0B74A606-CA5C-41BD-BF11-06313111C467}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Debug|x64.Build.0 = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Debug|x86.Build.0 = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Release|x64.ActiveCfg = Release|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Release|x64.Build.0 = Release|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Release|x86.ActiveCfg = Release|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Release|x86.Build.0 = Release|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{77E9C47D-4AC4-4402-8613-40DF427174BD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Release|x64.Build.0 = Release|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Release|x86.Build.0 = Release|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF501250-4105-4F79-A508-90B3A13A975A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Release|x64.Build.0 = Release|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Release|x86.Build.0 = Release|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BB54ED9D-FF71-4D91-B7C0-984AB0976798}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x64.Build.0 = Release|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Release|x86.Build.0 = Release|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0582BADC-0A09-4DF7-8D8A-9B6763FBE9F3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x64.Build.0 = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Debug|x86.Build.0 = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x64.ActiveCfg = Release|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x64.Build.0 = Release|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Release|x86.Build.0 = Release|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{39FCF17F-5CBD-4BF1-BDEF-37F5BA3EE4F6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Debug|x64.Build.0 = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Debug|x86.Build.0 = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Release|x64.ActiveCfg = Release|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Release|x64.Build.0 = Release|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Release|x86.ActiveCfg = Release|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Release|x86.Build.0 = Release|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2BB60758-1685-4FA8-B11E-75627B29F66A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Debug|x64.Build.0 = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Debug|x86.Build.0 = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Release|x64.ActiveCfg = Release|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Release|x64.Build.0 = Release|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Release|x86.Build.0 = Release|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EE6AF63D-8705-487B-959B-49FC2D499468}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F5EB9630-AD29-4880-963F-F2D39C684D8A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C746D448-E7C3-4850-9CA7-D3F1FA49742F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{BE45BF34-779D-4E14-9DD7-FD86E6EDC81E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{DFC77569-7EAD-4C2B-840D-3A58847A2962} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7B3C136F-F7AB-498F-A4B3-F512E83806B0}
+		SolutionGuid = {FDD40D53-AF3E-4A20-BE17-7555EB5494F9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
index 23fab5c1b1b3b3..86e7b05c46778a 100644
--- a/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
+++ b/src/libraries/System.ComponentModel.Annotations/System.ComponentModel.Annotations.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29101.129
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations.Tests", "tests\System.ComponentModel.Annotations.Tests.csproj", "{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4266D58F-EB60-46C2-BA81-3ABDE759A7D5} = {4266D58F-EB60-46C2-BA81-3ABDE759A7D5}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "src\System.ComponentModel.Annotations.csproj", "{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26} = {C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1B9E26FA-F362-40BA-B0CC-371858792EF7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "ref\System.ComponentModel.Annotations.csproj", "{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "ref\System.ComponentModel.Annotations.csproj", "{FD97F92D-762C-4657-9F80-AB7992681202}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations", "src\System.ComponentModel.Annotations.csproj", "{B60893E1-864C-4236-9D4B-F17540DEED86}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Annotations.Tests", "tests\System.ComponentModel.Annotations.Tests.csproj", "{E4C76FCB-4583-475C-B042-FC44BD1D73F2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{260925B5-FFCD-447A-8CD1-3783B5F3C5D3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1488943C-E709-42D8-8CFF-8062D547261B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{370A7C81-5E49-44C4-AC23-BDC838488D8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A1E54D25-4697-4E74-8C70-D7A67A580297}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D8582B90-E86A-4F83-9EA3-A444D251FDE9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4BF41FF4-3540-4DB7-9DF5-5D3287589D47}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9FC60D8A-C4DE-4914-99BB-55A4C6609A73}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ACAB6984-EB9D-4187-96E9-58ED91994467}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33} = {4BF41FF4-3540-4DB7-9DF5-5D3287589D47}
+		{E4C76FCB-4583-475C-B042-FC44BD1D73F2} = {4BF41FF4-3540-4DB7-9DF5-5D3287589D47}
+		{1B9E26FA-F362-40BA-B0CC-371858792EF7} = {9FC60D8A-C4DE-4914-99BB-55A4C6609A73}
+		{FD97F92D-762C-4657-9F80-AB7992681202} = {9FC60D8A-C4DE-4914-99BB-55A4C6609A73}
+		{260925B5-FFCD-447A-8CD1-3783B5F3C5D3} = {9FC60D8A-C4DE-4914-99BB-55A4C6609A73}
+		{A1E54D25-4697-4E74-8C70-D7A67A580297} = {9FC60D8A-C4DE-4914-99BB-55A4C6609A73}
+		{D8582B90-E86A-4F83-9EA3-A444D251FDE9} = {9FC60D8A-C4DE-4914-99BB-55A4C6609A73}
+		{B60893E1-864C-4236-9D4B-F17540DEED86} = {ACAB6984-EB9D-4187-96E9-58ED91994467}
+		{370A7C81-5E49-44C4-AC23-BDC838488D8E} = {ACAB6984-EB9D-4187-96E9-58ED91994467}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4266D58F-EB60-46C2-BA81-3ABDE759A7D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1488943C-E709-42D8-8CFF-8062D547261B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1488943C-E709-42D8-8CFF-8062D547261B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1488943C-E709-42D8-8CFF-8062D547261B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1488943C-E709-42D8-8CFF-8062D547261B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5ACAB439-ADEF-4CAC-BAD7-5AEE6801BE33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B9E26FA-F362-40BA-B0CC-371858792EF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B9E26FA-F362-40BA-B0CC-371858792EF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B9E26FA-F362-40BA-B0CC-371858792EF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B9E26FA-F362-40BA-B0CC-371858792EF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD97F92D-762C-4657-9F80-AB7992681202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD97F92D-762C-4657-9F80-AB7992681202}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD97F92D-762C-4657-9F80-AB7992681202}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD97F92D-762C-4657-9F80-AB7992681202}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B60893E1-864C-4236-9D4B-F17540DEED86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B60893E1-864C-4236-9D4B-F17540DEED86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B60893E1-864C-4236-9D4B-F17540DEED86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B60893E1-864C-4236-9D4B-F17540DEED86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4C76FCB-4583-475C-B042-FC44BD1D73F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{260925B5-FFCD-447A-8CD1-3783B5F3C5D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{370A7C81-5E49-44C4-AC23-BDC838488D8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{370A7C81-5E49-44C4-AC23-BDC838488D8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{370A7C81-5E49-44C4-AC23-BDC838488D8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{370A7C81-5E49-44C4-AC23-BDC838488D8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1E54D25-4697-4E74-8C70-D7A67A580297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1E54D25-4697-4E74-8C70-D7A67A580297}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1E54D25-4697-4E74-8C70-D7A67A580297}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1E54D25-4697-4E74-8C70-D7A67A580297}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8582B90-E86A-4F83-9EA3-A444D251FDE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8582B90-E86A-4F83-9EA3-A444D251FDE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8582B90-E86A-4F83-9EA3-A444D251FDE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8582B90-E86A-4F83-9EA3-A444D251FDE9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6E48765E-D6AC-4A79-9C2E-B5EE67EEDECF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4266D58F-EB60-46C2-BA81-3ABDE759A7D5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C4D6F1F4-DC7E-4756-9A88-171A8B1F1E26} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{1488943C-E709-42D8-8CFF-8062D547261B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {609A6C56-3EE1-4E65-AD40-CA3A0D32B2DD}
+		SolutionGuid = {4C1CDE35-7742-40EC-A075-B1ABF99F50B5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln b/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
index 1aabeaaa66ec0e..89de5a5ee79616 100644
--- a/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
+++ b/src/libraries/System.ComponentModel.Composition.Registration/System.ComponentModel.Composition.Registration.sln
@@ -1,60 +1,114 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Registration.Tests", "tests\System.ComponentModel.Composition.Registration.Tests.csproj", "{0F8CFFA3-6E16-4642-82C1-289D95338D7C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E3663E26-6819-4997-B372-94454DB4D60E} = {E3663E26-6819-4997-B372-94454DB4D60E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8E125AA7-17F9-467C-B58F-B37CEE76DA3F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Registration", "src\System.ComponentModel.Composition.Registration.csproj", "{E3663E26-6819-4997-B372-94454DB4D60E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D} = {6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FEE83A04-7615-43D7-BB34-46F7FD0DDF72}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Registration", "ref\System.ComponentModel.Composition.Registration.csproj", "{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Registration", "ref\System.ComponentModel.Composition.Registration.csproj", "{944AFEA1-B4FF-4309-9419-EFCA22347C60}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Registration", "src\System.ComponentModel.Composition.Registration.csproj", "{E427BC70-0F51-4DA8-995A-AC46E8E3A31B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Registration.Tests", "tests\System.ComponentModel.Composition.Registration.Tests.csproj", "{5B637911-605E-410D-93E3-F462332A0F14}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "..\System.ComponentModel.Composition\ref\System.ComponentModel.Composition.csproj", "{2DE556D7-9EB8-4763-B585-4EA9B45A5D9A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7AF11F0A-3D85-4FC7-975D-7ED452DFB9B1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "..\System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj", "{D598C12E-CFC4-42A8-A6D2-99FC7F527179}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "..\System.Reflection.Context\ref\System.Reflection.Context.csproj", "{0EFDCC75-E302-4A30-AC04-26DEF262333C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "..\System.Reflection.Context\src\System.Reflection.Context.csproj", "{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{12A42D4C-7FF5-4B2F-9910-50A413F5382F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{906977E7-C5B4-4CBC-B2A5-E56DABC3B125}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{343B6F2E-FE11-4ED9-A096-6CEC98DC894D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{3E0F104B-3410-48B9-A988-B841C03C5616}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{836773FD-30A2-4310-9DBD-08D2E5EA5CB6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C38B3212-DE62-4C5F-B363-F683DA2774DF}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8E125AA7-17F9-467C-B58F-B37CEE76DA3F} = {836773FD-30A2-4310-9DBD-08D2E5EA5CB6}
+		{5B637911-605E-410D-93E3-F462332A0F14} = {836773FD-30A2-4310-9DBD-08D2E5EA5CB6}
+		{FEE83A04-7615-43D7-BB34-46F7FD0DDF72} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{944AFEA1-B4FF-4309-9419-EFCA22347C60} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{2DE556D7-9EB8-4763-B585-4EA9B45A5D9A} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{0EFDCC75-E302-4A30-AC04-26DEF262333C} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{12A42D4C-7FF5-4B2F-9910-50A413F5382F} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{343B6F2E-FE11-4ED9-A096-6CEC98DC894D} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{3E0F104B-3410-48B9-A988-B841C03C5616} = {4CBE01B8-241B-4F3A-970E-70C9DA8AD4C0}
+		{E427BC70-0F51-4DA8-995A-AC46E8E3A31B} = {C38B3212-DE62-4C5F-B363-F683DA2774DF}
+		{D598C12E-CFC4-42A8-A6D2-99FC7F527179} = {C38B3212-DE62-4C5F-B363-F683DA2774DF}
+		{9154CFB5-AC90-4BC7-BECB-3BB588356ABE} = {C38B3212-DE62-4C5F-B363-F683DA2774DF}
+		{906977E7-C5B4-4CBC-B2A5-E56DABC3B125} = {C38B3212-DE62-4C5F-B363-F683DA2774DF}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F8CFFA3-6E16-4642-82C1-289D95338D7C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3663E26-6819-4997-B372-94454DB4D60E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3663E26-6819-4997-B372-94454DB4D60E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3663E26-6819-4997-B372-94454DB4D60E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3663E26-6819-4997-B372-94454DB4D60E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7AF11F0A-3D85-4FC7-975D-7ED452DFB9B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AF11F0A-3D85-4FC7-975D-7ED452DFB9B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7AF11F0A-3D85-4FC7-975D-7ED452DFB9B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AF11F0A-3D85-4FC7-975D-7ED452DFB9B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E125AA7-17F9-467C-B58F-B37CEE76DA3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E125AA7-17F9-467C-B58F-B37CEE76DA3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E125AA7-17F9-467C-B58F-B37CEE76DA3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E125AA7-17F9-467C-B58F-B37CEE76DA3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEE83A04-7615-43D7-BB34-46F7FD0DDF72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEE83A04-7615-43D7-BB34-46F7FD0DDF72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEE83A04-7615-43D7-BB34-46F7FD0DDF72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEE83A04-7615-43D7-BB34-46F7FD0DDF72}.Release|Any CPU.Build.0 = Release|Any CPU
+		{944AFEA1-B4FF-4309-9419-EFCA22347C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{944AFEA1-B4FF-4309-9419-EFCA22347C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{944AFEA1-B4FF-4309-9419-EFCA22347C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{944AFEA1-B4FF-4309-9419-EFCA22347C60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E427BC70-0F51-4DA8-995A-AC46E8E3A31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E427BC70-0F51-4DA8-995A-AC46E8E3A31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E427BC70-0F51-4DA8-995A-AC46E8E3A31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E427BC70-0F51-4DA8-995A-AC46E8E3A31B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B637911-605E-410D-93E3-F462332A0F14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B637911-605E-410D-93E3-F462332A0F14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B637911-605E-410D-93E3-F462332A0F14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B637911-605E-410D-93E3-F462332A0F14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DE556D7-9EB8-4763-B585-4EA9B45A5D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DE556D7-9EB8-4763-B585-4EA9B45A5D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DE556D7-9EB8-4763-B585-4EA9B45A5D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DE556D7-9EB8-4763-B585-4EA9B45A5D9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D598C12E-CFC4-42A8-A6D2-99FC7F527179}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D598C12E-CFC4-42A8-A6D2-99FC7F527179}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D598C12E-CFC4-42A8-A6D2-99FC7F527179}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D598C12E-CFC4-42A8-A6D2-99FC7F527179}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EFDCC75-E302-4A30-AC04-26DEF262333C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EFDCC75-E302-4A30-AC04-26DEF262333C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EFDCC75-E302-4A30-AC04-26DEF262333C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EFDCC75-E302-4A30-AC04-26DEF262333C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9154CFB5-AC90-4BC7-BECB-3BB588356ABE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12A42D4C-7FF5-4B2F-9910-50A413F5382F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{906977E7-C5B4-4CBC-B2A5-E56DABC3B125}.Release|Any CPU.Build.0 = Release|Any CPU
+		{343B6F2E-FE11-4ED9-A096-6CEC98DC894D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{343B6F2E-FE11-4ED9-A096-6CEC98DC894D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{343B6F2E-FE11-4ED9-A096-6CEC98DC894D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{343B6F2E-FE11-4ED9-A096-6CEC98DC894D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E0F104B-3410-48B9-A988-B841C03C5616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E0F104B-3410-48B9-A988-B841C03C5616}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E0F104B-3410-48B9-A988-B841C03C5616}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E0F104B-3410-48B9-A988-B841C03C5616}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0F8CFFA3-6E16-4642-82C1-289D95338D7C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E3663E26-6819-4997-B372-94454DB4D60E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{6E0C5F44-0160-4082-A25C-2DB8EA7ED30D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7AF11F0A-3D85-4FC7-975D-7ED452DFB9B1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3F452D8B-7A45-4EF1-A7E4-6F69D8EB92D0}
+		SolutionGuid = {05F0228A-52B7-460E-9A06-9D5A62E33BA6}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
index 5dd2018ebb0288..ab80fbb411bbb5 100644
--- a/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
+++ b/src/libraries/System.ComponentModel.Composition/System.ComponentModel.Composition.sln
@@ -1,70 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Tests", "tests\System.ComponentModel.Composition.Tests.csproj", "{59F4682D-C41D-45A7-9798-16C75525BB1D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A} = {2D694AC8-A12F-4622-9405-74E20EC40C3A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7D89E200-A6F9-4565-ABC9-FB22689B05B4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Noop.Assembly", "tests\System.ComponentModel.Composition.Noop.Assembly\System.ComponentModel.Composition.Noop.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A56}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A} = {2D694AC8-A12F-4622-9405-74E20EC40C3A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{92FCC45A-F6D5-401A-BBB6-1FFCE4570D6E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "src\System.ComponentModel.Composition.csproj", "{2D694AC8-A12F-4622-9405-74E20EC40C3A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DD3B8052-CE03-4159-8311-1CE1382C51B0} = {DD3B8052-CE03-4159-8311-1CE1382C51B0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "ref\System.ComponentModel.Composition.csproj", "{82F98B94-4E9D-457B-A391-F8F2766FBB2E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "ref\System.ComponentModel.Composition.csproj", "{DD3B8052-CE03-4159-8311-1CE1382C51B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "src\System.ComponentModel.Composition.csproj", "{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Noop.Assembly", "tests\System.ComponentModel.Composition.Noop.Assembly\System.ComponentModel.Composition.Noop.Assembly.csproj", "{E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition.Tests", "tests\System.ComponentModel.Composition.Tests.csproj", "{B21E5872-33E7-40D6-8A7F-33C0264A83E9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{144D1079-A9F9-454C-928B-B64F821F7BF1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{92D2B31D-210D-48D3-8772-9539A801E460}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{01551689-DC72-4051-BBDC-33117FF028D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F3633774-869D-4183-B5BA-3ABE88DEE5EC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6B6D5A87-46DA-4212-A084-D5AACB0A45D1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E2174C85-75E4-4D2D-8D14-F9CF8E003EF6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BFC3B5F6-5FC4-4FF5-9758-499B2399EE27}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7D89E200-A6F9-4565-ABC9-FB22689B05B4} = {6B6D5A87-46DA-4212-A084-D5AACB0A45D1}
+		{E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3} = {6B6D5A87-46DA-4212-A084-D5AACB0A45D1}
+		{B21E5872-33E7-40D6-8A7F-33C0264A83E9} = {6B6D5A87-46DA-4212-A084-D5AACB0A45D1}
+		{92FCC45A-F6D5-401A-BBB6-1FFCE4570D6E} = {E2174C85-75E4-4D2D-8D14-F9CF8E003EF6}
+		{82F98B94-4E9D-457B-A391-F8F2766FBB2E} = {E2174C85-75E4-4D2D-8D14-F9CF8E003EF6}
+		{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8} = {E2174C85-75E4-4D2D-8D14-F9CF8E003EF6}
+		{01551689-DC72-4051-BBDC-33117FF028D3} = {E2174C85-75E4-4D2D-8D14-F9CF8E003EF6}
+		{F3633774-869D-4183-B5BA-3ABE88DEE5EC} = {E2174C85-75E4-4D2D-8D14-F9CF8E003EF6}
+		{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613} = {BFC3B5F6-5FC4-4FF5-9758-499B2399EE27}
+		{92D2B31D-210D-48D3-8772-9539A801E460} = {BFC3B5F6-5FC4-4FF5-9758-499B2399EE27}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59F4682D-C41D-45A7-9798-16C75525BB1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59F4682D-C41D-45A7-9798-16C75525BB1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DD3B8052-CE03-4159-8311-1CE1382C51B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DD3B8052-CE03-4159-8311-1CE1382C51B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DD3B8052-CE03-4159-8311-1CE1382C51B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DD3B8052-CE03-4159-8311-1CE1382C51B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{144D1079-A9F9-454C-928B-B64F821F7BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{144D1079-A9F9-454C-928B-B64F821F7BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{144D1079-A9F9-454C-928B-B64F821F7BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{144D1079-A9F9-454C-928B-B64F821F7BF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D89E200-A6F9-4565-ABC9-FB22689B05B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D89E200-A6F9-4565-ABC9-FB22689B05B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D89E200-A6F9-4565-ABC9-FB22689B05B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D89E200-A6F9-4565-ABC9-FB22689B05B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92FCC45A-F6D5-401A-BBB6-1FFCE4570D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92FCC45A-F6D5-401A-BBB6-1FFCE4570D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92FCC45A-F6D5-401A-BBB6-1FFCE4570D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92FCC45A-F6D5-401A-BBB6-1FFCE4570D6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82F98B94-4E9D-457B-A391-F8F2766FBB2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82F98B94-4E9D-457B-A391-F8F2766FBB2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82F98B94-4E9D-457B-A391-F8F2766FBB2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82F98B94-4E9D-457B-A391-F8F2766FBB2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1B4D6FA-25CA-4F88-A7B4-BEADC53E9613}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2EDA1F3-8971-4FBF-AFD4-FD1EA21D58C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B21E5872-33E7-40D6-8A7F-33C0264A83E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96D9268A-76C1-4FD3-91F9-B73ACE9C86E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92D2B31D-210D-48D3-8772-9539A801E460}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92D2B31D-210D-48D3-8772-9539A801E460}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92D2B31D-210D-48D3-8772-9539A801E460}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92D2B31D-210D-48D3-8772-9539A801E460}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01551689-DC72-4051-BBDC-33117FF028D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01551689-DC72-4051-BBDC-33117FF028D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01551689-DC72-4051-BBDC-33117FF028D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01551689-DC72-4051-BBDC-33117FF028D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3633774-869D-4183-B5BA-3ABE88DEE5EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3633774-869D-4183-B5BA-3ABE88DEE5EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3633774-869D-4183-B5BA-3ABE88DEE5EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3633774-869D-4183-B5BA-3ABE88DEE5EC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{59F4682D-C41D-45A7-9798-16C75525BB1D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{396D6EBF-60BD-4DAF-8783-FB403E070A56} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2D694AC8-A12F-4622-9405-74E20EC40C3A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{DD3B8052-CE03-4159-8311-1CE1382C51B0} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{144D1079-A9F9-454C-928B-B64F821F7BF1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {23D18863-A768-4D64-8969-2FA1F82AFA7F}
+		SolutionGuid = {7852190A-F724-4BBB-969F-ECD086712D41}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
index ce28ba2fa78eed..4f032597dd9f19 100644
--- a/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
+++ b/src/libraries/System.ComponentModel.EventBasedAsync/System.ComponentModel.EventBasedAsync.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync.Tests", "tests\System.ComponentModel.EventBasedAsync.Tests.csproj", "{59E9B218-81D0-4A80-A4B7-66C716136D82}"
-	ProjectSection(ProjectDependencies) = postProject
-		{551A6340-8EEF-445E-A2A2-639CC23DBD36} = {551A6340-8EEF-445E-A2A2-639CC23DBD36}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{40480524-42C3-405F-AE9A-7578B829C696}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync", "src\System.ComponentModel.EventBasedAsync.csproj", "{551A6340-8EEF-445E-A2A2-639CC23DBD36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E7943063-5DB9-4EC6-86DD-3029E65121CE} = {E7943063-5DB9-4EC6-86DD-3029E65121CE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{157E55D7-13AC-4701-B44B-C9C5D7B09D03}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync", "ref\System.ComponentModel.EventBasedAsync.csproj", "{E7943063-5DB9-4EC6-86DD-3029E65121CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync", "ref\System.ComponentModel.EventBasedAsync.csproj", "{83BCEDA6-972E-4E26-9582-C53335A9F9C5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync", "src\System.ComponentModel.EventBasedAsync.csproj", "{04E0F296-DF67-45EB-8967-DADF4CBC9D6E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.EventBasedAsync.Tests", "tests\System.ComponentModel.EventBasedAsync.Tests.csproj", "{E79356D9-2598-489C-9ADF-59B2D95EA22C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3350F98E-14CE-4192-B5F4-13E56202C01E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{63E4FB4E-BB41-4581-8122-71FD5A35D90D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BCB250B7-3138-45E0-8A2D-32780A491B64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{36F00727-1E59-4281-9746-B5BD9EC1381D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{0ADE6E0D-03F9-47DD-B543-D9A4B303F8F0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8706A765-4794-47B9-AD2B-20A4F6044AA9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{118BDD7F-546D-4665-BD6B-24DE20C4B0D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D87193B7-CCBD-4072-862C-6F5DD1CC27CC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{40480524-42C3-405F-AE9A-7578B829C696} = {8706A765-4794-47B9-AD2B-20A4F6044AA9}
+		{E79356D9-2598-489C-9ADF-59B2D95EA22C} = {8706A765-4794-47B9-AD2B-20A4F6044AA9}
+		{157E55D7-13AC-4701-B44B-C9C5D7B09D03} = {118BDD7F-546D-4665-BD6B-24DE20C4B0D0}
+		{83BCEDA6-972E-4E26-9582-C53335A9F9C5} = {118BDD7F-546D-4665-BD6B-24DE20C4B0D0}
+		{3350F98E-14CE-4192-B5F4-13E56202C01E} = {118BDD7F-546D-4665-BD6B-24DE20C4B0D0}
+		{36F00727-1E59-4281-9746-B5BD9EC1381D} = {118BDD7F-546D-4665-BD6B-24DE20C4B0D0}
+		{0ADE6E0D-03F9-47DD-B543-D9A4B303F8F0} = {118BDD7F-546D-4665-BD6B-24DE20C4B0D0}
+		{04E0F296-DF67-45EB-8967-DADF4CBC9D6E} = {D87193B7-CCBD-4072-862C-6F5DD1CC27CC}
+		{BCB250B7-3138-45E0-8A2D-32780A491B64} = {D87193B7-CCBD-4072-862C-6F5DD1CC27CC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59E9B218-81D0-4A80-A4B7-66C716136D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59E9B218-81D0-4A80-A4B7-66C716136D82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{551A6340-8EEF-445E-A2A2-639CC23DBD36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{551A6340-8EEF-445E-A2A2-639CC23DBD36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7943063-5DB9-4EC6-86DD-3029E65121CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7943063-5DB9-4EC6-86DD-3029E65121CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7943063-5DB9-4EC6-86DD-3029E65121CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7943063-5DB9-4EC6-86DD-3029E65121CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63E4FB4E-BB41-4581-8122-71FD5A35D90D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63E4FB4E-BB41-4581-8122-71FD5A35D90D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63E4FB4E-BB41-4581-8122-71FD5A35D90D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63E4FB4E-BB41-4581-8122-71FD5A35D90D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40480524-42C3-405F-AE9A-7578B829C696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40480524-42C3-405F-AE9A-7578B829C696}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40480524-42C3-405F-AE9A-7578B829C696}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40480524-42C3-405F-AE9A-7578B829C696}.Release|Any CPU.Build.0 = Release|Any CPU
+		{157E55D7-13AC-4701-B44B-C9C5D7B09D03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{157E55D7-13AC-4701-B44B-C9C5D7B09D03}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{157E55D7-13AC-4701-B44B-C9C5D7B09D03}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{157E55D7-13AC-4701-B44B-C9C5D7B09D03}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83BCEDA6-972E-4E26-9582-C53335A9F9C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83BCEDA6-972E-4E26-9582-C53335A9F9C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83BCEDA6-972E-4E26-9582-C53335A9F9C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83BCEDA6-972E-4E26-9582-C53335A9F9C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04E0F296-DF67-45EB-8967-DADF4CBC9D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04E0F296-DF67-45EB-8967-DADF4CBC9D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04E0F296-DF67-45EB-8967-DADF4CBC9D6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04E0F296-DF67-45EB-8967-DADF4CBC9D6E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E79356D9-2598-489C-9ADF-59B2D95EA22C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3350F98E-14CE-4192-B5F4-13E56202C01E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3350F98E-14CE-4192-B5F4-13E56202C01E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3350F98E-14CE-4192-B5F4-13E56202C01E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3350F98E-14CE-4192-B5F4-13E56202C01E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCB250B7-3138-45E0-8A2D-32780A491B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCB250B7-3138-45E0-8A2D-32780A491B64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCB250B7-3138-45E0-8A2D-32780A491B64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCB250B7-3138-45E0-8A2D-32780A491B64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36F00727-1E59-4281-9746-B5BD9EC1381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36F00727-1E59-4281-9746-B5BD9EC1381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36F00727-1E59-4281-9746-B5BD9EC1381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36F00727-1E59-4281-9746-B5BD9EC1381D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0ADE6E0D-03F9-47DD-B543-D9A4B303F8F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0ADE6E0D-03F9-47DD-B543-D9A4B303F8F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0ADE6E0D-03F9-47DD-B543-D9A4B303F8F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0ADE6E0D-03F9-47DD-B543-D9A4B303F8F0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{59E9B218-81D0-4A80-A4B7-66C716136D82} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{551A6340-8EEF-445E-A2A2-639CC23DBD36} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{E7943063-5DB9-4EC6-86DD-3029E65121CE} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{63E4FB4E-BB41-4581-8122-71FD5A35D90D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {98A37BB2-63BD-4D83-8E88-8DAD99165057}
+		SolutionGuid = {29FF2FD6-28B0-4B47-B6E4-A170FD327623}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
index 6a8355a873664f..7bca0986f07fd1 100644
--- a/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
+++ b/src/libraries/System.ComponentModel.Primitives/System.ComponentModel.Primitives.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives.Tests", "tests\System.ComponentModel.Primitives.Tests.csproj", "{C9534425-93FB-494F-8DD8-1E4E3E626FDE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F620F382-30D1-451E-B125-2A612F92068B} = {F620F382-30D1-451E-B125-2A612F92068B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{60864013-CB8C-4FA3-9D79-6293FCDB2E6B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "src\System.ComponentModel.Primitives.csproj", "{F620F382-30D1-451E-B125-2A612F92068B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ECF37FA5-BEB7-4A23-A573-693B343B45C3} = {ECF37FA5-BEB7-4A23-A573-693B343B45C3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{DC07D8E2-8A8E-4197-BABE-06E23FA2F81F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "ref\System.ComponentModel.Primitives.csproj", "{ECF37FA5-BEB7-4A23-A573-693B343B45C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "ref\System.ComponentModel.Primitives.csproj", "{BA8A7204-1534-43C3-8BBE-F237C7328C42}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "src\System.ComponentModel.Primitives.csproj", "{E6024DD2-79AD-4639-A141-9DA38282F61B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives.Tests", "tests\System.ComponentModel.Primitives.Tests.csproj", "{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{24C45B93-8278-4D65-9BA3-4FE1FB27245F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CFE7E578-B382-4363-95AC-10DAC343D332}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{4622D386-0897-4A6C-8F48-76CACEA1C764}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2B3C4121-9689-4F71-8737-EA1DEA2BFE25}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EF535AAD-4242-487F-B25C-ACDCA5C8267D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D9BECD0C-CE15-49B2-BC5E-BD1F87E77371}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4F03ABD9-E119-48B9-8DB8-F44A6E674AEA}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{60864013-CB8C-4FA3-9D79-6293FCDB2E6B} = {EF535AAD-4242-487F-B25C-ACDCA5C8267D}
+		{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C} = {EF535AAD-4242-487F-B25C-ACDCA5C8267D}
+		{DC07D8E2-8A8E-4197-BABE-06E23FA2F81F} = {D9BECD0C-CE15-49B2-BC5E-BD1F87E77371}
+		{BA8A7204-1534-43C3-8BBE-F237C7328C42} = {D9BECD0C-CE15-49B2-BC5E-BD1F87E77371}
+		{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743} = {D9BECD0C-CE15-49B2-BC5E-BD1F87E77371}
+		{4622D386-0897-4A6C-8F48-76CACEA1C764} = {D9BECD0C-CE15-49B2-BC5E-BD1F87E77371}
+		{2B3C4121-9689-4F71-8737-EA1DEA2BFE25} = {D9BECD0C-CE15-49B2-BC5E-BD1F87E77371}
+		{E6024DD2-79AD-4639-A141-9DA38282F61B} = {4F03ABD9-E119-48B9-8DB8-F44A6E674AEA}
+		{CFE7E578-B382-4363-95AC-10DAC343D332} = {4F03ABD9-E119-48B9-8DB8-F44A6E674AEA}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C9534425-93FB-494F-8DD8-1E4E3E626FDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F620F382-30D1-451E-B125-2A612F92068B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F620F382-30D1-451E-B125-2A612F92068B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F620F382-30D1-451E-B125-2A612F92068B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F620F382-30D1-451E-B125-2A612F92068B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECF37FA5-BEB7-4A23-A573-693B343B45C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24C45B93-8278-4D65-9BA3-4FE1FB27245F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24C45B93-8278-4D65-9BA3-4FE1FB27245F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24C45B93-8278-4D65-9BA3-4FE1FB27245F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24C45B93-8278-4D65-9BA3-4FE1FB27245F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60864013-CB8C-4FA3-9D79-6293FCDB2E6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60864013-CB8C-4FA3-9D79-6293FCDB2E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60864013-CB8C-4FA3-9D79-6293FCDB2E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60864013-CB8C-4FA3-9D79-6293FCDB2E6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC07D8E2-8A8E-4197-BABE-06E23FA2F81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC07D8E2-8A8E-4197-BABE-06E23FA2F81F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC07D8E2-8A8E-4197-BABE-06E23FA2F81F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC07D8E2-8A8E-4197-BABE-06E23FA2F81F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA8A7204-1534-43C3-8BBE-F237C7328C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA8A7204-1534-43C3-8BBE-F237C7328C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA8A7204-1534-43C3-8BBE-F237C7328C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA8A7204-1534-43C3-8BBE-F237C7328C42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6024DD2-79AD-4639-A141-9DA38282F61B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6024DD2-79AD-4639-A141-9DA38282F61B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6024DD2-79AD-4639-A141-9DA38282F61B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6024DD2-79AD-4639-A141-9DA38282F61B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F272C6B3-AA58-4AB9-84A0-5E90E38B1C6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBCF1CE8-40E6-4498-8F52-BFF97ECCE743}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFE7E578-B382-4363-95AC-10DAC343D332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFE7E578-B382-4363-95AC-10DAC343D332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFE7E578-B382-4363-95AC-10DAC343D332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFE7E578-B382-4363-95AC-10DAC343D332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4622D386-0897-4A6C-8F48-76CACEA1C764}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4622D386-0897-4A6C-8F48-76CACEA1C764}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4622D386-0897-4A6C-8F48-76CACEA1C764}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4622D386-0897-4A6C-8F48-76CACEA1C764}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B3C4121-9689-4F71-8737-EA1DEA2BFE25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B3C4121-9689-4F71-8737-EA1DEA2BFE25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B3C4121-9689-4F71-8737-EA1DEA2BFE25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B3C4121-9689-4F71-8737-EA1DEA2BFE25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C9534425-93FB-494F-8DD8-1E4E3E626FDE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F620F382-30D1-451E-B125-2A612F92068B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{ECF37FA5-BEB7-4A23-A573-693B343B45C3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{24C45B93-8278-4D65-9BA3-4FE1FB27245F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C0017B27-ED79-4BB5-AE2D-3A6AEAECCDA9}
+		SolutionGuid = {D4ED660D-B8E6-404D-B0B0-C7A31244A916}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
index 99b3943bc023fc..8661e5d73fa92a 100644
--- a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
+++ b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter.Tests", "tests\System.ComponentModel.TypeConverter.Tests.csproj", "{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} = {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0CF88416-BA94-4C5C-8947-D21F4897C70B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter", "src\System.ComponentModel.TypeConverter.csproj", "{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D35FD24C-1D1E-4860-B44D-73097CC0BD90} = {D35FD24C-1D1E-4860-B44D-73097CC0BD90}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D98C322F-247F-4011-ADFF-E56E7AFD00B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter", "ref\System.ComponentModel.TypeConverter.csproj", "{D35FD24C-1D1E-4860-B44D-73097CC0BD90}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter", "ref\System.ComponentModel.TypeConverter.csproj", "{0B2F32D4-9E58-4680-AB59-35D86E4162CE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter", "src\System.ComponentModel.TypeConverter.csproj", "{CE7DA286-D119-4087-A953-D542727AFA02}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter.Tests", "tests\System.ComponentModel.TypeConverter.Tests.csproj", "{6A370CD8-E44B-46C9-B29A-87F847483336}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A280B655-9D66-4B33-88DC-733B4929053F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9A047A62-BF41-480D-B424-24DC8530124B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3A665FC8-BE83-4065-A806-5C7DC40EBDF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{887B1B9F-0D97-4AC2-9405-1F1425EC10B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{05293375-8A75-4CEB-9B4E-3443FBAD0115}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{526BFAA4-58F6-4947-B8DF-92DD8870906E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7C566CAE-31BF-4DD2-8BDD-59DA93A6AA51}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0CF88416-BA94-4C5C-8947-D21F4897C70B} = {05293375-8A75-4CEB-9B4E-3443FBAD0115}
+		{6A370CD8-E44B-46C9-B29A-87F847483336} = {05293375-8A75-4CEB-9B4E-3443FBAD0115}
+		{D98C322F-247F-4011-ADFF-E56E7AFD00B1} = {526BFAA4-58F6-4947-B8DF-92DD8870906E}
+		{0B2F32D4-9E58-4680-AB59-35D86E4162CE} = {526BFAA4-58F6-4947-B8DF-92DD8870906E}
+		{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E} = {526BFAA4-58F6-4947-B8DF-92DD8870906E}
+		{3A665FC8-BE83-4065-A806-5C7DC40EBDF9} = {526BFAA4-58F6-4947-B8DF-92DD8870906E}
+		{887B1B9F-0D97-4AC2-9405-1F1425EC10B5} = {526BFAA4-58F6-4947-B8DF-92DD8870906E}
+		{CE7DA286-D119-4087-A953-D542727AFA02} = {7C566CAE-31BF-4DD2-8BDD-59DA93A6AA51}
+		{9A047A62-BF41-480D-B424-24DC8530124B} = {7C566CAE-31BF-4DD2-8BDD-59DA93A6AA51}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F0326A1-9E19-4A6C-95CE-63E65C9D2030}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D35FD24C-1D1E-4860-B44D-73097CC0BD90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A280B655-9D66-4B33-88DC-733B4929053F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A280B655-9D66-4B33-88DC-733B4929053F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A280B655-9D66-4B33-88DC-733B4929053F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A280B655-9D66-4B33-88DC-733B4929053F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CF88416-BA94-4C5C-8947-D21F4897C70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CF88416-BA94-4C5C-8947-D21F4897C70B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CF88416-BA94-4C5C-8947-D21F4897C70B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CF88416-BA94-4C5C-8947-D21F4897C70B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D98C322F-247F-4011-ADFF-E56E7AFD00B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D98C322F-247F-4011-ADFF-E56E7AFD00B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D98C322F-247F-4011-ADFF-E56E7AFD00B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D98C322F-247F-4011-ADFF-E56E7AFD00B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B2F32D4-9E58-4680-AB59-35D86E4162CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B2F32D4-9E58-4680-AB59-35D86E4162CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B2F32D4-9E58-4680-AB59-35D86E4162CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B2F32D4-9E58-4680-AB59-35D86E4162CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE7DA286-D119-4087-A953-D542727AFA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE7DA286-D119-4087-A953-D542727AFA02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE7DA286-D119-4087-A953-D542727AFA02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE7DA286-D119-4087-A953-D542727AFA02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A370CD8-E44B-46C9-B29A-87F847483336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A370CD8-E44B-46C9-B29A-87F847483336}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A370CD8-E44B-46C9-B29A-87F847483336}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A370CD8-E44B-46C9-B29A-87F847483336}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFB9C5EE-7CF7-4AFB-841E-B4A542DB191E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A047A62-BF41-480D-B424-24DC8530124B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A047A62-BF41-480D-B424-24DC8530124B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A047A62-BF41-480D-B424-24DC8530124B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A047A62-BF41-480D-B424-24DC8530124B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A665FC8-BE83-4065-A806-5C7DC40EBDF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A665FC8-BE83-4065-A806-5C7DC40EBDF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A665FC8-BE83-4065-A806-5C7DC40EBDF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A665FC8-BE83-4065-A806-5C7DC40EBDF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{887B1B9F-0D97-4AC2-9405-1F1425EC10B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{887B1B9F-0D97-4AC2-9405-1F1425EC10B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{887B1B9F-0D97-4AC2-9405-1F1425EC10B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{887B1B9F-0D97-4AC2-9405-1F1425EC10B5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3F0326A1-9E19-4A6C-95CE-63E65C9D2030} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D35FD24C-1D1E-4860-B44D-73097CC0BD90} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A280B655-9D66-4B33-88DC-733B4929053F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {EE151A1D-5E52-4614-8FA4-042163AF0E1F}
+		SolutionGuid = {1D4639D9-A4BD-410A-9491-E5F8D82DE8BF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ComponentModel/System.ComponentModel.sln b/src/libraries/System.ComponentModel/System.ComponentModel.sln
index f57420cf81382c..17484ada267b3a 100644
--- a/src/libraries/System.ComponentModel/System.ComponentModel.sln
+++ b/src/libraries/System.ComponentModel/System.ComponentModel.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Tests", "tests\System.ComponentModel.Tests.csproj", "{40C01084-DAB1-4F24-8729-85523BC9F04E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C} = {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{BB836E1E-706E-495A-85EA-0CDD9FEBF101}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel", "src\System.ComponentModel.csproj", "{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF} = {2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{70FDC08C-421C-40B2-82C4-DE147346BE92}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel", "ref\System.ComponentModel.csproj", "{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel", "ref\System.ComponentModel.csproj", "{E954E33E-6349-4FA2-AF54-A3BCFE430879}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel", "src\System.ComponentModel.csproj", "{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Tests", "tests\System.ComponentModel.Tests.csproj", "{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5B8652C4-99B5-4D03-B07B-88A5B96442A2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6AC8C04D-428A-45BE-A79F-FD405F4A2ADD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{77E31F96-C799-4AF8-BA29-90DEAC1EC739}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{39A4EDF4-47BC-4C19-A4C3-0065A1CC9847}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A663DB2C-2C97-4795-BA33-2697706351D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{62F53E21-D0DA-4D70-A4FF-2328BEC44AEB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E759F60-011D-4FEB-92B6-4613D2F36016}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{BB836E1E-706E-495A-85EA-0CDD9FEBF101} = {A663DB2C-2C97-4795-BA33-2697706351D5}
+		{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7} = {A663DB2C-2C97-4795-BA33-2697706351D5}
+		{70FDC08C-421C-40B2-82C4-DE147346BE92} = {62F53E21-D0DA-4D70-A4FF-2328BEC44AEB}
+		{E954E33E-6349-4FA2-AF54-A3BCFE430879} = {62F53E21-D0DA-4D70-A4FF-2328BEC44AEB}
+		{5B8652C4-99B5-4D03-B07B-88A5B96442A2} = {62F53E21-D0DA-4D70-A4FF-2328BEC44AEB}
+		{77E31F96-C799-4AF8-BA29-90DEAC1EC739} = {62F53E21-D0DA-4D70-A4FF-2328BEC44AEB}
+		{39A4EDF4-47BC-4C19-A4C3-0065A1CC9847} = {62F53E21-D0DA-4D70-A4FF-2328BEC44AEB}
+		{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F} = {5E759F60-011D-4FEB-92B6-4613D2F36016}
+		{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2} = {5E759F60-011D-4FEB-92B6-4613D2F36016}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6AC8C04D-428A-45BE-A79F-FD405F4A2ADD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AC8C04D-428A-45BE-A79F-FD405F4A2ADD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AC8C04D-428A-45BE-A79F-FD405F4A2ADD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6AC8C04D-428A-45BE-A79F-FD405F4A2ADD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB836E1E-706E-495A-85EA-0CDD9FEBF101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB836E1E-706E-495A-85EA-0CDD9FEBF101}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB836E1E-706E-495A-85EA-0CDD9FEBF101}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB836E1E-706E-495A-85EA-0CDD9FEBF101}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70FDC08C-421C-40B2-82C4-DE147346BE92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70FDC08C-421C-40B2-82C4-DE147346BE92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70FDC08C-421C-40B2-82C4-DE147346BE92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70FDC08C-421C-40B2-82C4-DE147346BE92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E954E33E-6349-4FA2-AF54-A3BCFE430879}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E954E33E-6349-4FA2-AF54-A3BCFE430879}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E954E33E-6349-4FA2-AF54-A3BCFE430879}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E954E33E-6349-4FA2-AF54-A3BCFE430879}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFFECBCD-A544-4649-AF79-3C2A7EEB4C6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E375A78-D856-4C1E-B7CB-A4026C9FD8E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B8652C4-99B5-4D03-B07B-88A5B96442A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AAA2B20-75FC-42CE-9148-DBDA5840BDC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77E31F96-C799-4AF8-BA29-90DEAC1EC739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77E31F96-C799-4AF8-BA29-90DEAC1EC739}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77E31F96-C799-4AF8-BA29-90DEAC1EC739}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77E31F96-C799-4AF8-BA29-90DEAC1EC739}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39A4EDF4-47BC-4C19-A4C3-0065A1CC9847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39A4EDF4-47BC-4C19-A4C3-0065A1CC9847}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39A4EDF4-47BC-4C19-A4C3-0065A1CC9847}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39A4EDF4-47BC-4C19-A4C3-0065A1CC9847}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{40C01084-DAB1-4F24-8729-85523BC9F04E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D40BC4CC-544F-4F49-A9E1-C81FFF784B2C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2F84DFF4-DD9C-42C2-B192-2B7D1944C1EF} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{6AC8C04D-428A-45BE-A79F-FD405F4A2ADD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D9C9DDF4-131F-4F90-A8B9-D6683CBB2362}
+		SolutionGuid = {F6E6B62A-C9F6-4CF9-BFC4-F169919B707A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
index bb47de8105c21a..bee7eba740f8ab 100644
--- a/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
+++ b/src/libraries/System.Composition.AttributedModel/System.Composition.AttributedModel.sln
@@ -1,48 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributeModel.Tests", "tests\System.Composition.AttributeModel.Tests.csproj", "{853BB14F-8A5B-42B4-A053-21DE1AEBB335}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C6257381-C624-494A-A9D9-5586E60856EA} = {C6257381-C624-494A-A9D9-5586E60856EA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DE339A1B-75B9-4D96-AC66-F497B37FEE96}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributedModel", "src\System.Composition.AttributedModel.csproj", "{C6257381-C624-494A-A9D9-5586E60856EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{6BB5F832-CE51-42EE-B244-1971303F4FAB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "..\System.ComponentModel.Composition\ref\System.ComponentModel.Composition.csproj", "{B62DF545-08AB-40E1-9DED-755583B0B3B3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "..\System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj", "{7C81E44B-A3A6-4707-AC60-8B6452FE35C2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F1318FB3-74E5-40B2-AA0E-318322C7BD24}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributedModel", "src\System.Composition.AttributedModel.csproj", "{3DD99E03-A4D3-456A-BA2F-A7351423B800}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributeModel.Tests", "tests\System.Composition.AttributeModel.Tests.csproj", "{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9FEBA284-3545-42BB-8514-665D08114C5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{C1859D8A-0416-4FA7-824F-BCDD47095653}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{C833E568-E5FB-4FFE-A243-3EA6457E5E97}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DA1B8A61-521D-42B1-850B-E29E443DE81E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E94BC945-F20C-4F99-8ACB-B0F40B540CBF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A295D5F-7539-4A1A-A225-2F291C15B486}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{DE339A1B-75B9-4D96-AC66-F497B37FEE96} = {DA1B8A61-521D-42B1-850B-E29E443DE81E}
+		{C2EBC4C3-C97B-4F64-A647-87DAE2816A06} = {DA1B8A61-521D-42B1-850B-E29E443DE81E}
+		{6BB5F832-CE51-42EE-B244-1971303F4FAB} = {E94BC945-F20C-4F99-8ACB-B0F40B540CBF}
+		{B62DF545-08AB-40E1-9DED-755583B0B3B3} = {E94BC945-F20C-4F99-8ACB-B0F40B540CBF}
+		{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0} = {E94BC945-F20C-4F99-8ACB-B0F40B540CBF}
+		{C1859D8A-0416-4FA7-824F-BCDD47095653} = {E94BC945-F20C-4F99-8ACB-B0F40B540CBF}
+		{C833E568-E5FB-4FFE-A243-3EA6457E5E97} = {E94BC945-F20C-4F99-8ACB-B0F40B540CBF}
+		{7C81E44B-A3A6-4707-AC60-8B6452FE35C2} = {3A295D5F-7539-4A1A-A225-2F291C15B486}
+		{3DD99E03-A4D3-456A-BA2F-A7351423B800} = {3A295D5F-7539-4A1A-A225-2F291C15B486}
+		{9FEBA284-3545-42BB-8514-665D08114C5F} = {3A295D5F-7539-4A1A-A225-2F291C15B486}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{853BB14F-8A5B-42B4-A053-21DE1AEBB335}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C6257381-C624-494A-A9D9-5586E60856EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C6257381-C624-494A-A9D9-5586E60856EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6257381-C624-494A-A9D9-5586E60856EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C6257381-C624-494A-A9D9-5586E60856EA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1318FB3-74E5-40B2-AA0E-318322C7BD24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1318FB3-74E5-40B2-AA0E-318322C7BD24}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1318FB3-74E5-40B2-AA0E-318322C7BD24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1318FB3-74E5-40B2-AA0E-318322C7BD24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE339A1B-75B9-4D96-AC66-F497B37FEE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE339A1B-75B9-4D96-AC66-F497B37FEE96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE339A1B-75B9-4D96-AC66-F497B37FEE96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE339A1B-75B9-4D96-AC66-F497B37FEE96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BB5F832-CE51-42EE-B244-1971303F4FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BB5F832-CE51-42EE-B244-1971303F4FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BB5F832-CE51-42EE-B244-1971303F4FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BB5F832-CE51-42EE-B244-1971303F4FAB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B62DF545-08AB-40E1-9DED-755583B0B3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B62DF545-08AB-40E1-9DED-755583B0B3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B62DF545-08AB-40E1-9DED-755583B0B3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B62DF545-08AB-40E1-9DED-755583B0B3B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C81E44B-A3A6-4707-AC60-8B6452FE35C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C81E44B-A3A6-4707-AC60-8B6452FE35C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C81E44B-A3A6-4707-AC60-8B6452FE35C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C81E44B-A3A6-4707-AC60-8B6452FE35C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DD99E03-A4D3-456A-BA2F-A7351423B800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DD99E03-A4D3-456A-BA2F-A7351423B800}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DD99E03-A4D3-456A-BA2F-A7351423B800}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DD99E03-A4D3-456A-BA2F-A7351423B800}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2EBC4C3-C97B-4F64-A647-87DAE2816A06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D3FD5CB-8CB6-4C51-8774-413EFAAE60F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FEBA284-3545-42BB-8514-665D08114C5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FEBA284-3545-42BB-8514-665D08114C5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FEBA284-3545-42BB-8514-665D08114C5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FEBA284-3545-42BB-8514-665D08114C5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1859D8A-0416-4FA7-824F-BCDD47095653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1859D8A-0416-4FA7-824F-BCDD47095653}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1859D8A-0416-4FA7-824F-BCDD47095653}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1859D8A-0416-4FA7-824F-BCDD47095653}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C833E568-E5FB-4FFE-A243-3EA6457E5E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C833E568-E5FB-4FFE-A243-3EA6457E5E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C833E568-E5FB-4FFE-A243-3EA6457E5E97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C833E568-E5FB-4FFE-A243-3EA6457E5E97}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{853BB14F-8A5B-42B4-A053-21DE1AEBB335} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C6257381-C624-494A-A9D9-5586E60856EA} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F1318FB3-74E5-40B2-AA0E-318322C7BD24} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A24B6C69-2D91-4420-83CF-EDBE20728CFA}
+		SolutionGuid = {0C208CE9-53A6-4D20-9851-9D565EC19AAD}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
index 0217d9ab613dcf..23b7ea3ee3c372 100644
--- a/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
+++ b/src/libraries/System.Composition.Convention/System.Composition.Convention.sln
@@ -1,48 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Convention.Tests", "tests\System.Composition.Convention.Tests.csproj", "{17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E6592FAD-10B5-4B56-9287-D72DD136992F} = {E6592FAD-10B5-4B56-9287-D72DD136992F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E09C71E1-E08B-4EFC-8F76-D939462FEC78}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Convention", "src\System.Composition.Convention.csproj", "{E6592FAD-10B5-4B56-9287-D72DD136992F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{AFC44C99-4470-48EE-ACB7-B896B128CA46}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributedModel", "..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj", "{2C83FC12-946A-4ECD-8A72-7662C3649F10}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Convention", "src\System.Composition.Convention.csproj", "{5C6D1A36-CD72-42C6-827E-1288CA27592A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{27D27E0D-DBC1-4510-92E4-FDC900660BEA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Convention.Tests", "tests\System.Composition.Convention.Tests.csproj", "{6AD56989-0DAF-4292-9EEE-83AFB360ED0C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting", "..\System.Composition.Hosting\src\System.Composition.Hosting.csproj", "{7839BCF8-8B5A-465B-A4B6-86CE4227AF81}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "..\System.Composition.Runtime\src\System.Composition.Runtime.csproj", "{782AA503-8808-4741-AECF-D79A6BF3EFF7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts", "..\System.Composition.TypedParts\src\System.Composition.TypedParts.csproj", "{5AAFDB16-AACF-4446-9285-26AAC815101B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F98D4222-5D8F-4814-A86B-6706A88312DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{51F71AEF-7682-4D52-AF40-F31FFC82C60D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8220C8D4-ED5E-4FB1-9BAF-5CFB506A7116}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{1EC7A3FA-A64A-4ACB-88D6-D1C98049E773}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{48E459E7-9C04-465B-8990-0B76EDEE88F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{205217AC-EA4D-46BB-8768-F322D0D4C319}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A15702C-891A-4228-B365-F022478D98C0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E09C71E1-E08B-4EFC-8F76-D939462FEC78} = {48E459E7-9C04-465B-8990-0B76EDEE88F1}
+		{6AD56989-0DAF-4292-9EEE-83AFB360ED0C} = {48E459E7-9C04-465B-8990-0B76EDEE88F1}
+		{AFC44C99-4470-48EE-ACB7-B896B128CA46} = {205217AC-EA4D-46BB-8768-F322D0D4C319}
+		{F98D4222-5D8F-4814-A86B-6706A88312DC} = {205217AC-EA4D-46BB-8768-F322D0D4C319}
+		{8220C8D4-ED5E-4FB1-9BAF-5CFB506A7116} = {205217AC-EA4D-46BB-8768-F322D0D4C319}
+		{1EC7A3FA-A64A-4ACB-88D6-D1C98049E773} = {205217AC-EA4D-46BB-8768-F322D0D4C319}
+		{2C83FC12-946A-4ECD-8A72-7662C3649F10} = {3A15702C-891A-4228-B365-F022478D98C0}
+		{5C6D1A36-CD72-42C6-827E-1288CA27592A} = {3A15702C-891A-4228-B365-F022478D98C0}
+		{7839BCF8-8B5A-465B-A4B6-86CE4227AF81} = {3A15702C-891A-4228-B365-F022478D98C0}
+		{782AA503-8808-4741-AECF-D79A6BF3EFF7} = {3A15702C-891A-4228-B365-F022478D98C0}
+		{5AAFDB16-AACF-4446-9285-26AAC815101B} = {3A15702C-891A-4228-B365-F022478D98C0}
+		{51F71AEF-7682-4D52-AF40-F31FFC82C60D} = {3A15702C-891A-4228-B365-F022478D98C0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17DBE1D4-FCB5-4D55-805C-C4A22EE8C032}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6592FAD-10B5-4B56-9287-D72DD136992F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6592FAD-10B5-4B56-9287-D72DD136992F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6592FAD-10B5-4B56-9287-D72DD136992F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6592FAD-10B5-4B56-9287-D72DD136992F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27D27E0D-DBC1-4510-92E4-FDC900660BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27D27E0D-DBC1-4510-92E4-FDC900660BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27D27E0D-DBC1-4510-92E4-FDC900660BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27D27E0D-DBC1-4510-92E4-FDC900660BEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E09C71E1-E08B-4EFC-8F76-D939462FEC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E09C71E1-E08B-4EFC-8F76-D939462FEC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E09C71E1-E08B-4EFC-8F76-D939462FEC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E09C71E1-E08B-4EFC-8F76-D939462FEC78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFC44C99-4470-48EE-ACB7-B896B128CA46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFC44C99-4470-48EE-ACB7-B896B128CA46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFC44C99-4470-48EE-ACB7-B896B128CA46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFC44C99-4470-48EE-ACB7-B896B128CA46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C83FC12-946A-4ECD-8A72-7662C3649F10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C83FC12-946A-4ECD-8A72-7662C3649F10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C83FC12-946A-4ECD-8A72-7662C3649F10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C83FC12-946A-4ECD-8A72-7662C3649F10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C6D1A36-CD72-42C6-827E-1288CA27592A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C6D1A36-CD72-42C6-827E-1288CA27592A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C6D1A36-CD72-42C6-827E-1288CA27592A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C6D1A36-CD72-42C6-827E-1288CA27592A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AD56989-0DAF-4292-9EEE-83AFB360ED0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AD56989-0DAF-4292-9EEE-83AFB360ED0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AD56989-0DAF-4292-9EEE-83AFB360ED0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AD56989-0DAF-4292-9EEE-83AFB360ED0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7839BCF8-8B5A-465B-A4B6-86CE4227AF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7839BCF8-8B5A-465B-A4B6-86CE4227AF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7839BCF8-8B5A-465B-A4B6-86CE4227AF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7839BCF8-8B5A-465B-A4B6-86CE4227AF81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{782AA503-8808-4741-AECF-D79A6BF3EFF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{782AA503-8808-4741-AECF-D79A6BF3EFF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{782AA503-8808-4741-AECF-D79A6BF3EFF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{782AA503-8808-4741-AECF-D79A6BF3EFF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AAFDB16-AACF-4446-9285-26AAC815101B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AAFDB16-AACF-4446-9285-26AAC815101B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AAFDB16-AACF-4446-9285-26AAC815101B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AAFDB16-AACF-4446-9285-26AAC815101B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F98D4222-5D8F-4814-A86B-6706A88312DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F98D4222-5D8F-4814-A86B-6706A88312DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F98D4222-5D8F-4814-A86B-6706A88312DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F98D4222-5D8F-4814-A86B-6706A88312DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51F71AEF-7682-4D52-AF40-F31FFC82C60D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8220C8D4-ED5E-4FB1-9BAF-5CFB506A7116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8220C8D4-ED5E-4FB1-9BAF-5CFB506A7116}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8220C8D4-ED5E-4FB1-9BAF-5CFB506A7116}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8220C8D4-ED5E-4FB1-9BAF-5CFB506A7116}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EC7A3FA-A64A-4ACB-88D6-D1C98049E773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EC7A3FA-A64A-4ACB-88D6-D1C98049E773}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EC7A3FA-A64A-4ACB-88D6-D1C98049E773}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EC7A3FA-A64A-4ACB-88D6-D1C98049E773}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{17DBE1D4-FCB5-4D55-805C-C4A22EE8C032} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E6592FAD-10B5-4B56-9287-D72DD136992F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{27D27E0D-DBC1-4510-92E4-FDC900660BEA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {65F903CD-B6E3-4982-BBB1-515753763974}
+		SolutionGuid = {3F85CAA1-0651-4FD6-81E7-45CFF63779BA}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
index f5eae716d2e884..5ffd7ad02102ef 100644
--- a/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
+++ b/src/libraries/System.Composition.Hosting/System.Composition.Hosting.sln
@@ -1,48 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting.Tests", "tests\System.Composition.Hosting.Tests.csproj", "{52BE9F68-69EC-44AA-806E-11EFB57D9B4B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2} = {2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{44A29AA4-209C-4CA9-BB25-4B42F8F5F259}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting", "src\System.Composition.Hosting.csproj", "{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{21ECA0FD-26F9-4FA6-8531-3C5E717C2D44}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting", "src\System.Composition.Hosting.csproj", "{991FC8D9-6A92-4A79-91EC-BD72005687AF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting.Tests", "tests\System.Composition.Hosting.Tests.csproj", "{0F595512-D4BE-4042-9C8A-F0816A7B27AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{08B264BA-A209-4D92-B347-1DD7F35A1E38}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "..\System.Composition.Runtime\src\System.Composition.Runtime.csproj", "{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CA6FD82A-E3D3-40BA-B135-981E9BE11074}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{BFFC7F67-066C-4C69-AF00-B3FC4E1E2C95}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{923489C9-718A-448E-9A98-B6F27238F6BE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{96F324CC-6EDB-4CC7-8146-61D5CF85A6E7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3D7D0C89-1716-407A-BB98-D6345444B01F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{44A29AA4-209C-4CA9-BB25-4B42F8F5F259} = {923489C9-718A-448E-9A98-B6F27238F6BE}
+		{0F595512-D4BE-4042-9C8A-F0816A7B27AD} = {923489C9-718A-448E-9A98-B6F27238F6BE}
+		{21ECA0FD-26F9-4FA6-8531-3C5E717C2D44} = {96F324CC-6EDB-4CC7-8146-61D5CF85A6E7}
+		{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16} = {96F324CC-6EDB-4CC7-8146-61D5CF85A6E7}
+		{CA6FD82A-E3D3-40BA-B135-981E9BE11074} = {96F324CC-6EDB-4CC7-8146-61D5CF85A6E7}
+		{BFFC7F67-066C-4C69-AF00-B3FC4E1E2C95} = {96F324CC-6EDB-4CC7-8146-61D5CF85A6E7}
+		{991FC8D9-6A92-4A79-91EC-BD72005687AF} = {3D7D0C89-1716-407A-BB98-D6345444B01F}
+		{4C5E5AB8-480F-49F2-AF28-29C2EE713A39} = {3D7D0C89-1716-407A-BB98-D6345444B01F}
+		{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D} = {3D7D0C89-1716-407A-BB98-D6345444B01F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52BE9F68-69EC-44AA-806E-11EFB57D9B4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{08B264BA-A209-4D92-B347-1DD7F35A1E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08B264BA-A209-4D92-B347-1DD7F35A1E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08B264BA-A209-4D92-B347-1DD7F35A1E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08B264BA-A209-4D92-B347-1DD7F35A1E38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44A29AA4-209C-4CA9-BB25-4B42F8F5F259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44A29AA4-209C-4CA9-BB25-4B42F8F5F259}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44A29AA4-209C-4CA9-BB25-4B42F8F5F259}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44A29AA4-209C-4CA9-BB25-4B42F8F5F259}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21ECA0FD-26F9-4FA6-8531-3C5E717C2D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21ECA0FD-26F9-4FA6-8531-3C5E717C2D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21ECA0FD-26F9-4FA6-8531-3C5E717C2D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21ECA0FD-26F9-4FA6-8531-3C5E717C2D44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{991FC8D9-6A92-4A79-91EC-BD72005687AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{991FC8D9-6A92-4A79-91EC-BD72005687AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{991FC8D9-6A92-4A79-91EC-BD72005687AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{991FC8D9-6A92-4A79-91EC-BD72005687AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F595512-D4BE-4042-9C8A-F0816A7B27AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F595512-D4BE-4042-9C8A-F0816A7B27AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F595512-D4BE-4042-9C8A-F0816A7B27AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F595512-D4BE-4042-9C8A-F0816A7B27AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C5E5AB8-480F-49F2-AF28-29C2EE713A39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D5AF3B3-B83C-425B-AEB8-EA8F1A308E16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46D78F2B-5DB4-43BF-BBA2-EB02CA97101D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA6FD82A-E3D3-40BA-B135-981E9BE11074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA6FD82A-E3D3-40BA-B135-981E9BE11074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA6FD82A-E3D3-40BA-B135-981E9BE11074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA6FD82A-E3D3-40BA-B135-981E9BE11074}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFFC7F67-066C-4C69-AF00-B3FC4E1E2C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFFC7F67-066C-4C69-AF00-B3FC4E1E2C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFFC7F67-066C-4C69-AF00-B3FC4E1E2C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFFC7F67-066C-4C69-AF00-B3FC4E1E2C95}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{52BE9F68-69EC-44AA-806E-11EFB57D9B4B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2B8FECC6-34A1-48FE-BA75-99572D2D6DB2} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{08B264BA-A209-4D92-B347-1DD7F35A1E38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4D9B75F6-D7E6-4E2C-BFDE-72F227FE7117}
+		SolutionGuid = {EE971A55-D6EB-4648-BA96-BA8BC454EDC5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
index 93dcb7a72306bc..57ed9b81b3c261 100644
--- a/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
+++ b/src/libraries/System.Composition.Runtime/System.Composition.Runtime.sln
@@ -1,48 +1,79 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime.Tests", "tests\System.Composition.Runtime.Tests.csproj", "{3B6042E6-9765-4A03-9089-92050100C85E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2711DFD2-8541-4628-BC53-EB784A14CDCF} = {2711DFD2-8541-4628-BC53-EB784A14CDCF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{31F52C37-63E5-46F9-A5DE-894E8AC91475}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "src\System.Composition.Runtime.csproj", "{2711DFD2-8541-4628-BC53-EB784A14CDCF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{AFE1C4D7-0189-44CE-959B-D5F27E4D7B71}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "src\System.Composition.Runtime.csproj", "{BAC53BBD-B949-419D-833B-54B6A03A1389}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime.Tests", "tests\System.Composition.Runtime.Tests.csproj", "{B19B1509-313D-497D-9636-9A7AD5022DCF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F6A223BB-CB73-4F82-9029-946150692273}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2A785B2A-FC00-4976-9135-4EA134D44BEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{62F8B390-A4BE-4E9D-8C0C-91F72B207D9B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C3A9471F-9EFF-4447-83A8-BAF3842F9171}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{18FB41BC-8B42-499D-9A1C-33E2E5AFC0CD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E251F0CD-1C58-421C-916C-6F5FEAEADE32}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{31F52C37-63E5-46F9-A5DE-894E8AC91475} = {C3A9471F-9EFF-4447-83A8-BAF3842F9171}
+		{B19B1509-313D-497D-9636-9A7AD5022DCF} = {C3A9471F-9EFF-4447-83A8-BAF3842F9171}
+		{AFE1C4D7-0189-44CE-959B-D5F27E4D7B71} = {18FB41BC-8B42-499D-9A1C-33E2E5AFC0CD}
+		{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB} = {18FB41BC-8B42-499D-9A1C-33E2E5AFC0CD}
+		{2A785B2A-FC00-4976-9135-4EA134D44BEC} = {18FB41BC-8B42-499D-9A1C-33E2E5AFC0CD}
+		{62F8B390-A4BE-4E9D-8C0C-91F72B207D9B} = {18FB41BC-8B42-499D-9A1C-33E2E5AFC0CD}
+		{BAC53BBD-B949-419D-833B-54B6A03A1389} = {E251F0CD-1C58-421C-916C-6F5FEAEADE32}
+		{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC} = {E251F0CD-1C58-421C-916C-6F5FEAEADE32}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3B6042E6-9765-4A03-9089-92050100C85E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B6042E6-9765-4A03-9089-92050100C85E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B6042E6-9765-4A03-9089-92050100C85E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B6042E6-9765-4A03-9089-92050100C85E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2711DFD2-8541-4628-BC53-EB784A14CDCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2711DFD2-8541-4628-BC53-EB784A14CDCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2711DFD2-8541-4628-BC53-EB784A14CDCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2711DFD2-8541-4628-BC53-EB784A14CDCF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6A223BB-CB73-4F82-9029-946150692273}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6A223BB-CB73-4F82-9029-946150692273}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6A223BB-CB73-4F82-9029-946150692273}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6A223BB-CB73-4F82-9029-946150692273}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31F52C37-63E5-46F9-A5DE-894E8AC91475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31F52C37-63E5-46F9-A5DE-894E8AC91475}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31F52C37-63E5-46F9-A5DE-894E8AC91475}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31F52C37-63E5-46F9-A5DE-894E8AC91475}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFE1C4D7-0189-44CE-959B-D5F27E4D7B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFE1C4D7-0189-44CE-959B-D5F27E4D7B71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFE1C4D7-0189-44CE-959B-D5F27E4D7B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFE1C4D7-0189-44CE-959B-D5F27E4D7B71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAC53BBD-B949-419D-833B-54B6A03A1389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAC53BBD-B949-419D-833B-54B6A03A1389}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAC53BBD-B949-419D-833B-54B6A03A1389}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAC53BBD-B949-419D-833B-54B6A03A1389}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B19B1509-313D-497D-9636-9A7AD5022DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B19B1509-313D-497D-9636-9A7AD5022DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B19B1509-313D-497D-9636-9A7AD5022DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B19B1509-313D-497D-9636-9A7AD5022DCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA73B72F-7C6F-479D-8141-CDD66F2EA7FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C24C1E34-B65C-4DAA-A29D-382FCC04E9DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A785B2A-FC00-4976-9135-4EA134D44BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A785B2A-FC00-4976-9135-4EA134D44BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A785B2A-FC00-4976-9135-4EA134D44BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A785B2A-FC00-4976-9135-4EA134D44BEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62F8B390-A4BE-4E9D-8C0C-91F72B207D9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62F8B390-A4BE-4E9D-8C0C-91F72B207D9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62F8B390-A4BE-4E9D-8C0C-91F72B207D9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62F8B390-A4BE-4E9D-8C0C-91F72B207D9B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3B6042E6-9765-4A03-9089-92050100C85E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2711DFD2-8541-4628-BC53-EB784A14CDCF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F6A223BB-CB73-4F82-9029-946150692273} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7483F39D-92EE-4290-AA6A-6DCE79DA2791}
+		SolutionGuid = {7686D4EE-C99C-4FC3-AF5C-F06B154E4A54}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
index 3b57f5ffe71388..1c9e20eb66ecb5 100644
--- a/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
+++ b/src/libraries/System.Composition.TypedParts/System.Composition.TypedParts.sln
@@ -1,48 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts.Tests", "tests\System.Composition.TypedParts.Tests.csproj", "{8D1CB149-B52E-472B-A91F-DF1C77D8BA46}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E} = {B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CA8B80E6-875F-4C21-83E2-4EB57AADAA8F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts", "src\System.Composition.TypedParts.csproj", "{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0AE27BFC-4A71-4FED-B71E-B7688EF5C9C5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributedModel", "..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj", "{6A17CBBC-46E8-4837-8AFF-D834B6CD8691}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Convention", "..\System.Composition.Convention\src\System.Composition.Convention.csproj", "{88652FCF-A44D-4B81-ADB1-6C15260CFB80}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8877AB17-7981-4110-B690-D96B7B4B1B8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting", "..\System.Composition.Hosting\src\System.Composition.Hosting.csproj", "{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "..\System.Composition.Runtime\src\System.Composition.Runtime.csproj", "{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts", "src\System.Composition.TypedParts.csproj", "{1B533355-A67E-4912-9605-A08FC7870291}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts.Tests", "tests\System.Composition.TypedParts.Tests.csproj", "{38C096D0-5E23-47E2-A074-5F9852075459}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0774F258-3ADD-4791-B9B6-36234CFE5B0B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F96B5C76-C7C4-410E-9E40-173A4C14DBC0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{0380CCEC-9B4B-4E63-BC3E-1AE7B9161C7D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{64AB414D-ECCE-4190-A4F9-DE9ED8069E5C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D7E1E36D-E497-4F38-9463-94D770E651E0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B262B362-30B4-44EB-B39F-12FA12A464B7}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{CA8B80E6-875F-4C21-83E2-4EB57AADAA8F} = {64AB414D-ECCE-4190-A4F9-DE9ED8069E5C}
+		{38C096D0-5E23-47E2-A074-5F9852075459} = {64AB414D-ECCE-4190-A4F9-DE9ED8069E5C}
+		{0AE27BFC-4A71-4FED-B71E-B7688EF5C9C5} = {D7E1E36D-E497-4F38-9463-94D770E651E0}
+		{0774F258-3ADD-4791-B9B6-36234CFE5B0B} = {D7E1E36D-E497-4F38-9463-94D770E651E0}
+		{F96B5C76-C7C4-410E-9E40-173A4C14DBC0} = {D7E1E36D-E497-4F38-9463-94D770E651E0}
+		{0380CCEC-9B4B-4E63-BC3E-1AE7B9161C7D} = {D7E1E36D-E497-4F38-9463-94D770E651E0}
+		{6A17CBBC-46E8-4837-8AFF-D834B6CD8691} = {B262B362-30B4-44EB-B39F-12FA12A464B7}
+		{88652FCF-A44D-4B81-ADB1-6C15260CFB80} = {B262B362-30B4-44EB-B39F-12FA12A464B7}
+		{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D} = {B262B362-30B4-44EB-B39F-12FA12A464B7}
+		{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15} = {B262B362-30B4-44EB-B39F-12FA12A464B7}
+		{1B533355-A67E-4912-9605-A08FC7870291} = {B262B362-30B4-44EB-B39F-12FA12A464B7}
+		{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB} = {B262B362-30B4-44EB-B39F-12FA12A464B7}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D1CB149-B52E-472B-A91F-DF1C77D8BA46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8877AB17-7981-4110-B690-D96B7B4B1B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8877AB17-7981-4110-B690-D96B7B4B1B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8877AB17-7981-4110-B690-D96B7B4B1B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8877AB17-7981-4110-B690-D96B7B4B1B8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA8B80E6-875F-4C21-83E2-4EB57AADAA8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA8B80E6-875F-4C21-83E2-4EB57AADAA8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA8B80E6-875F-4C21-83E2-4EB57AADAA8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA8B80E6-875F-4C21-83E2-4EB57AADAA8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AE27BFC-4A71-4FED-B71E-B7688EF5C9C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AE27BFC-4A71-4FED-B71E-B7688EF5C9C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AE27BFC-4A71-4FED-B71E-B7688EF5C9C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AE27BFC-4A71-4FED-B71E-B7688EF5C9C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A17CBBC-46E8-4837-8AFF-D834B6CD8691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A17CBBC-46E8-4837-8AFF-D834B6CD8691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A17CBBC-46E8-4837-8AFF-D834B6CD8691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A17CBBC-46E8-4837-8AFF-D834B6CD8691}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88652FCF-A44D-4B81-ADB1-6C15260CFB80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88652FCF-A44D-4B81-ADB1-6C15260CFB80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88652FCF-A44D-4B81-ADB1-6C15260CFB80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88652FCF-A44D-4B81-ADB1-6C15260CFB80}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8B6031E-5DD0-4BE8-9D70-960B24B1D23D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E6C1F3-C318-47FF-B0BC-CFC04BC4AB15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B533355-A67E-4912-9605-A08FC7870291}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B533355-A67E-4912-9605-A08FC7870291}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B533355-A67E-4912-9605-A08FC7870291}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B533355-A67E-4912-9605-A08FC7870291}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38C096D0-5E23-47E2-A074-5F9852075459}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38C096D0-5E23-47E2-A074-5F9852075459}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38C096D0-5E23-47E2-A074-5F9852075459}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38C096D0-5E23-47E2-A074-5F9852075459}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0774F258-3ADD-4791-B9B6-36234CFE5B0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DC81D88-9EC5-4C8F-83CB-3102F2F626AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F96B5C76-C7C4-410E-9E40-173A4C14DBC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F96B5C76-C7C4-410E-9E40-173A4C14DBC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F96B5C76-C7C4-410E-9E40-173A4C14DBC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F96B5C76-C7C4-410E-9E40-173A4C14DBC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0380CCEC-9B4B-4E63-BC3E-1AE7B9161C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0380CCEC-9B4B-4E63-BC3E-1AE7B9161C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0380CCEC-9B4B-4E63-BC3E-1AE7B9161C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0380CCEC-9B4B-4E63-BC3E-1AE7B9161C7D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8D1CB149-B52E-472B-A91F-DF1C77D8BA46} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B4B5E15C-E6B9-48EA-94C2-F067484D4D3E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{8877AB17-7981-4110-B690-D96B7B4B1B8F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3373081C-C3A1-450B-9D5C-FB892CD08D8B}
+		SolutionGuid = {699ABEC3-0D6B-4050-B86A-C6E1317DE039}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Composition/System.Composition.sln b/src/libraries/System.Composition/System.Composition.sln
index f4e907e8f7e855..4cc842a4eea09c 100644
--- a/src/libraries/System.Composition/System.Composition.sln
+++ b/src/libraries/System.Composition/System.Composition.sln
@@ -1,50 +1,121 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Tests", "tests\System.Composition.Tests.csproj", "{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B7690923-904C-4C76-8E39-83B5E30B74CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Composition.Demos.ExtendedCollectionImports", "tests\Microsoft.Composition.Demos.ExtendedCollectionImports\Microsoft.Composition.Demos.ExtendedCollectionImports.csproj", "{44C7E52C-3873-4C64-875C-8A23A8376D60}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1B4069B3-13C2-40CA-92AB-1BBC9D440654}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLibrary", "tests\TestLibrary\TestLibrary.csproj", "{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.AttributedModel", "..\System.Composition.AttributedModel\src\System.Composition.AttributedModel.csproj", "{34A434B3-E95A-4C66-903E-DCBABCAC9091}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Convention", "..\System.Composition.Convention\src\System.Composition.Convention.csproj", "{64B94BD1-D18E-47E1-A2AE-FE2F0A23D5C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{69BF9A23-1A4E-4980-BFB1-902296C83120}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Hosting", "..\System.Composition.Hosting\src\System.Composition.Hosting.csproj", "{ADF1E9B2-7740-47B7-81B7-222FD5E136A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Runtime", "..\System.Composition.Runtime\src\System.Composition.Runtime.csproj", "{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.TypedParts", "..\System.Composition.TypedParts\src\System.Composition.TypedParts.csproj", "{E3295CB6-16E3-497C-A696-71A077DD5828}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Composition.Demos.ExtendedCollectionImports", "tests\Microsoft.Composition.Demos.ExtendedCollectionImports\Microsoft.Composition.Demos.ExtendedCollectionImports.csproj", "{6E8E4CDA-4573-4F9D-9BDD-EDF98568E2C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Composition.Tests", "tests\System.Composition.Tests.csproj", "{CB0DF0EC-4F33-4DEB-A773-8D871E135AD5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLibrary", "tests\TestLibrary\TestLibrary.csproj", "{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ABFBB6AD-0A7C-4545-A129-3B7D5327E277}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{AFD8B15A-E1A4-412A-A08B-9C3587A87B26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F4FC2925-7B00-4763-B830-FD88A93E0359}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3BBCD0BF-4301-424E-A6EB-7D729D6AB735}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{869F605D-5AC2-4A48-AADA-22D14201B6B2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04DF6753-EE23-424F-A626-50D9CC88B844}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B7690923-904C-4C76-8E39-83B5E30B74CD} = {3BBCD0BF-4301-424E-A6EB-7D729D6AB735}
+		{6E8E4CDA-4573-4F9D-9BDD-EDF98568E2C0} = {3BBCD0BF-4301-424E-A6EB-7D729D6AB735}
+		{CB0DF0EC-4F33-4DEB-A773-8D871E135AD5} = {3BBCD0BF-4301-424E-A6EB-7D729D6AB735}
+		{B16BCA17-DCA8-43B7-8E8A-89033F7A676E} = {3BBCD0BF-4301-424E-A6EB-7D729D6AB735}
+		{1B4069B3-13C2-40CA-92AB-1BBC9D440654} = {869F605D-5AC2-4A48-AADA-22D14201B6B2}
+		{ABFBB6AD-0A7C-4545-A129-3B7D5327E277} = {869F605D-5AC2-4A48-AADA-22D14201B6B2}
+		{AFD8B15A-E1A4-412A-A08B-9C3587A87B26} = {869F605D-5AC2-4A48-AADA-22D14201B6B2}
+		{F4FC2925-7B00-4763-B830-FD88A93E0359} = {869F605D-5AC2-4A48-AADA-22D14201B6B2}
+		{34A434B3-E95A-4C66-903E-DCBABCAC9091} = {04DF6753-EE23-424F-A626-50D9CC88B844}
+		{64B94BD1-D18E-47E1-A2AE-FE2F0A23D5C3} = {04DF6753-EE23-424F-A626-50D9CC88B844}
+		{ADF1E9B2-7740-47B7-81B7-222FD5E136A7} = {04DF6753-EE23-424F-A626-50D9CC88B844}
+		{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64} = {04DF6753-EE23-424F-A626-50D9CC88B844}
+		{E3295CB6-16E3-497C-A696-71A077DD5828} = {04DF6753-EE23-424F-A626-50D9CC88B844}
+		{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8} = {04DF6753-EE23-424F-A626-50D9CC88B844}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4852A19F-C05C-478D-BFA0-59FD03DE0E3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{44C7E52C-3873-4C64-875C-8A23A8376D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{44C7E52C-3873-4C64-875C-8A23A8376D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{44C7E52C-3873-4C64-875C-8A23A8376D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{44C7E52C-3873-4C64-875C-8A23A8376D60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69BF9A23-1A4E-4980-BFB1-902296C83120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69BF9A23-1A4E-4980-BFB1-902296C83120}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69BF9A23-1A4E-4980-BFB1-902296C83120}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69BF9A23-1A4E-4980-BFB1-902296C83120}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7690923-904C-4C76-8E39-83B5E30B74CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7690923-904C-4C76-8E39-83B5E30B74CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7690923-904C-4C76-8E39-83B5E30B74CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7690923-904C-4C76-8E39-83B5E30B74CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B4069B3-13C2-40CA-92AB-1BBC9D440654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4069B3-13C2-40CA-92AB-1BBC9D440654}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B4069B3-13C2-40CA-92AB-1BBC9D440654}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B4069B3-13C2-40CA-92AB-1BBC9D440654}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34A434B3-E95A-4C66-903E-DCBABCAC9091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34A434B3-E95A-4C66-903E-DCBABCAC9091}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34A434B3-E95A-4C66-903E-DCBABCAC9091}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34A434B3-E95A-4C66-903E-DCBABCAC9091}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64B94BD1-D18E-47E1-A2AE-FE2F0A23D5C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64B94BD1-D18E-47E1-A2AE-FE2F0A23D5C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64B94BD1-D18E-47E1-A2AE-FE2F0A23D5C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64B94BD1-D18E-47E1-A2AE-FE2F0A23D5C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADF1E9B2-7740-47B7-81B7-222FD5E136A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADF1E9B2-7740-47B7-81B7-222FD5E136A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADF1E9B2-7740-47B7-81B7-222FD5E136A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADF1E9B2-7740-47B7-81B7-222FD5E136A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60940C78-4DDA-4CDD-BA1C-8C9B6DB4FB64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3295CB6-16E3-497C-A696-71A077DD5828}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3295CB6-16E3-497C-A696-71A077DD5828}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3295CB6-16E3-497C-A696-71A077DD5828}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3295CB6-16E3-497C-A696-71A077DD5828}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E8E4CDA-4573-4F9D-9BDD-EDF98568E2C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E8E4CDA-4573-4F9D-9BDD-EDF98568E2C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E8E4CDA-4573-4F9D-9BDD-EDF98568E2C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E8E4CDA-4573-4F9D-9BDD-EDF98568E2C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB0DF0EC-4F33-4DEB-A773-8D871E135AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB0DF0EC-4F33-4DEB-A773-8D871E135AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB0DF0EC-4F33-4DEB-A773-8D871E135AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB0DF0EC-4F33-4DEB-A773-8D871E135AD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B16BCA17-DCA8-43B7-8E8A-89033F7A676E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABFBB6AD-0A7C-4545-A129-3B7D5327E277}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E9A94D5-DC06-4A7F-B73D-43EA7DE0B8B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFD8B15A-E1A4-412A-A08B-9C3587A87B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFD8B15A-E1A4-412A-A08B-9C3587A87B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFD8B15A-E1A4-412A-A08B-9C3587A87B26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFD8B15A-E1A4-412A-A08B-9C3587A87B26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4FC2925-7B00-4763-B830-FD88A93E0359}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4FC2925-7B00-4763-B830-FD88A93E0359}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4FC2925-7B00-4763-B830-FD88A93E0359}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4FC2925-7B00-4763-B830-FD88A93E0359}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4852A19F-C05C-478D-BFA0-59FD03DE0E3F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{44C7E52C-3873-4C64-875C-8A23A8376D60} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{DA6841A5-0344-4CC7-98B0-89CBEE18DEE3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{69BF9A23-1A4E-4980-BFB1-902296C83120} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5BEDEB84-AC24-4154-B838-AD53AE822667}
+		SolutionGuid = {66F5BC63-E142-4B22-8B5D-1FF5206A7171}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
index 4f217d1bbf898a..3be755d851f664 100644
--- a/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
+++ b/src/libraries/System.Configuration.ConfigurationManager/System.Configuration.ConfigurationManager.sln
@@ -1,60 +1,149 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager.Tests", "tests\System.Configuration.ConfigurationManager.Tests.csproj", "{7669C397-C21C-4C08-83F1-BE6691911E88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B7697463-7C98-4462-BA09-67B7BF3842B6} = {B7697463-7C98-4462-BA09-67B7BF3842B6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{15012FB4-9C7C-4DE0-AB44-83A64654D738}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "src\System.Configuration.ConfigurationManager.csproj", "{B7697463-7C98-4462-BA09-67B7BF3842B6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FD6AA2B9-56DB-4BCC-85E0-7727506562B0} = {FD6AA2B9-56DB-4BCC-85E0-7727506562B0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B0C1DAC5-145F-482B-A1E2-C95B33144FC6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "ref\System.Configuration.ConfigurationManager.csproj", "{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "ref\System.Configuration.ConfigurationManager.csproj", "{6F662E39-BB56-4BCF-B053-B4A1782A33E1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "src\System.Configuration.ConfigurationManager.csproj", "{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager.Tests", "tests\System.Configuration.ConfigurationManager.Tests.csproj", "{9476F50F-E44C-4420-96AB-448259A47C4F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{10CD484E-5BF8-40EC-901E-2E4EB5609DB6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C2304393-E1F2-41A9-8ED2-6513F654E6D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BD71A962-9AA8-46C2-A44D-B6B1CB605015}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B6916437-8EF0-4BF8-BCB6-E063C9397C26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{DECD7431-49B8-4C94-AA8F-532FF2015A7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{CFF7519C-4D41-4713-991D-27777DA2DB21}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{949E8FCF-79C3-48BA-92AE-B937ADDB7221}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{1818C2C7-ABF4-46D6-AA56-BB114D82F31C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{462B4FC9-D224-4BE4-9272-4138D06F7434}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{998C6747-2474-4C00-B6BC-F9F467D9CCE2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B67F05A3-B45E-4033-A200-76B5842CB65C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738} = {462B4FC9-D224-4BE4-9272-4138D06F7434}
+		{9476F50F-E44C-4420-96AB-448259A47C4F} = {462B4FC9-D224-4BE4-9272-4138D06F7434}
+		{B0C1DAC5-145F-482B-A1E2-C95B33144FC6} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{C2304393-E1F2-41A9-8ED2-6513F654E6D2} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{B6916437-8EF0-4BF8-BCB6-E063C9397C26} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{CFF7519C-4D41-4713-991D-27777DA2DB21} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{949E8FCF-79C3-48BA-92AE-B937ADDB7221} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248} = {998C6747-2474-4C00-B6BC-F9F467D9CCE2}
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+		{BD71A962-9AA8-46C2-A44D-B6B1CB605015} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+		{DECD7431-49B8-4C94-AA8F-532FF2015A7D} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+		{1818C2C7-ABF4-46D6-AA56-BB114D82F31C} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1} = {B67F05A3-B45E-4033-A200-76B5842CB65C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7669C397-C21C-4C08-83F1-BE6691911E88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7669C397-C21C-4C08-83F1-BE6691911E88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7669C397-C21C-4C08-83F1-BE6691911E88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7669C397-C21C-4C08-83F1-BE6691911E88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7697463-7C98-4462-BA09-67B7BF3842B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7697463-7C98-4462-BA09-67B7BF3842B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7697463-7C98-4462-BA09-67B7BF3842B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7697463-7C98-4462-BA09-67B7BF3842B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD6AA2B9-56DB-4BCC-85E0-7727506562B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10CD484E-5BF8-40EC-901E-2E4EB5609DB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10CD484E-5BF8-40EC-901E-2E4EB5609DB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10CD484E-5BF8-40EC-901E-2E4EB5609DB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10CD484E-5BF8-40EC-901E-2E4EB5609DB6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15012FB4-9C7C-4DE0-AB44-83A64654D738}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0C1DAC5-145F-482B-A1E2-C95B33144FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0C1DAC5-145F-482B-A1E2-C95B33144FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0C1DAC5-145F-482B-A1E2-C95B33144FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0C1DAC5-145F-482B-A1E2-C95B33144FC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F662E39-BB56-4BCF-B053-B4A1782A33E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C9D7BE4-BF9C-486C-8ADF-53DE282E018A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9476F50F-E44C-4420-96AB-448259A47C4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B586A50-5DFE-4FBE-A65B-9152B992C2E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2304393-E1F2-41A9-8ED2-6513F654E6D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD71A962-9AA8-46C2-A44D-B6B1CB605015}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6916437-8EF0-4BF8-BCB6-E063C9397C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6916437-8EF0-4BF8-BCB6-E063C9397C26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6916437-8EF0-4BF8-BCB6-E063C9397C26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6916437-8EF0-4BF8-BCB6-E063C9397C26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DECD7431-49B8-4C94-AA8F-532FF2015A7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DECD7431-49B8-4C94-AA8F-532FF2015A7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DECD7431-49B8-4C94-AA8F-532FF2015A7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DECD7431-49B8-4C94-AA8F-532FF2015A7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C48B652-BA62-4D46-9CDD-24A1670EE3E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B2CA04A-9DFB-471E-B4CB-1937D0049B96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFF7519C-4D41-4713-991D-27777DA2DB21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2BE20C4A-C20B-4A0C-8E4A-31B681B6967D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{949E8FCF-79C3-48BA-92AE-B937ADDB7221}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{949E8FCF-79C3-48BA-92AE-B937ADDB7221}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{949E8FCF-79C3-48BA-92AE-B937ADDB7221}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{949E8FCF-79C3-48BA-92AE-B937ADDB7221}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1818C2C7-ABF4-46D6-AA56-BB114D82F31C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1818C2C7-ABF4-46D6-AA56-BB114D82F31C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1818C2C7-ABF4-46D6-AA56-BB114D82F31C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1818C2C7-ABF4-46D6-AA56-BB114D82F31C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3278A0F9-8E0A-42E1-8FE3-1A01851A6248}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E34EBFC8-D1BC-4ED7-8335-C183A5994EE1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7669C397-C21C-4C08-83F1-BE6691911E88} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B7697463-7C98-4462-BA09-67B7BF3842B6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{FD6AA2B9-56DB-4BCC-85E0-7727506562B0} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{10CD484E-5BF8-40EC-901E-2E4EB5609DB6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2A7070B4-C2EA-49C3-BEF1-E5BB001D99DF}
+		SolutionGuid = {942CAD8E-C19B-4B9A-BEDE-09B43F45F535}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Console/System.Console.sln b/src/libraries/System.Console/System.Console.sln
index 9513c781538c8b..6596faaf3ed595 100644
--- a/src/libraries/System.Console/System.Console.sln
+++ b/src/libraries/System.Console/System.Console.sln
@@ -1,70 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Tests", "tests\System.Console.Tests.csproj", "{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{67E15C52-4FF6-4149-9D90-2DFF24EA01EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Manual.Tests", "tests\ManualTests\System.Console.Manual.Tests.csproj", "{99E5069D-241F-48A6-8F29-404B4AED72BF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{844166B0-B783-42B9-A507-D2F3A8DCC628}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console", "src\System.Console.csproj", "{F9DF2357-81B4-4317-908E-512DA9395583}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9EB75B87-2BE5-48E5-8988-A0929CE6664E} = {9EB75B87-2BE5-48E5-8988-A0929CE6664E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console", "ref\System.Console.csproj", "{A998F8E4-797F-4852-8D38-CD322F637AA4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console", "ref\System.Console.csproj", "{9EB75B87-2BE5-48E5-8988-A0929CE6664E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console", "src\System.Console.csproj", "{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Manual.Tests", "tests\ManualTests\System.Console.Manual.Tests.csproj", "{E1A675DB-487B-4119-9F47-1E4EF38CF158}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Tests", "tests\System.Console.Tests.csproj", "{3B84D3D5-57C0-47E6-B763-3D51BB62AD7B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "..\System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8261A605-FCBF-4D54-AC09-5248EBF93158}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F454A4F9-AFA0-47F4-9690-75058B2C68DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{7766AD72-71FF-45EF-B075-26509830EAF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E5663631-6394-476B-BEDE-CC4A2E4E3BAC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1761741D-BC95-446B-BA58-CC3B0B450298}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{71332B26-1FA2-4C2D-A17A-6F4309B99524}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{05EB75BC-0F7D-41FD-B4D9-04B646538F71}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{67E15C52-4FF6-4149-9D90-2DFF24EA01EA} = {1761741D-BC95-446B-BA58-CC3B0B450298}
+		{E1A675DB-487B-4119-9F47-1E4EF38CF158} = {1761741D-BC95-446B-BA58-CC3B0B450298}
+		{3B84D3D5-57C0-47E6-B763-3D51BB62AD7B} = {1761741D-BC95-446B-BA58-CC3B0B450298}
+		{844166B0-B783-42B9-A507-D2F3A8DCC628} = {71332B26-1FA2-4C2D-A17A-6F4309B99524}
+		{A998F8E4-797F-4852-8D38-CD322F637AA4} = {71332B26-1FA2-4C2D-A17A-6F4309B99524}
+		{F454A4F9-AFA0-47F4-9690-75058B2C68DF} = {71332B26-1FA2-4C2D-A17A-6F4309B99524}
+		{7766AD72-71FF-45EF-B075-26509830EAF9} = {71332B26-1FA2-4C2D-A17A-6F4309B99524}
+		{E5663631-6394-476B-BEDE-CC4A2E4E3BAC} = {71332B26-1FA2-4C2D-A17A-6F4309B99524}
+		{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606} = {05EB75BC-0F7D-41FD-B4D9-04B646538F71}
+		{BAA75C96-57D9-4EDF-8DDF-392DB08B2047} = {05EB75BC-0F7D-41FD-B4D9-04B646538F71}
+		{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B} = {05EB75BC-0F7D-41FD-B4D9-04B646538F71}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99E5069D-241F-48A6-8F29-404B4AED72BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99E5069D-241F-48A6-8F29-404B4AED72BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9DF2357-81B4-4317-908E-512DA9395583}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9DF2357-81B4-4317-908E-512DA9395583}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EB75B87-2BE5-48E5-8988-A0929CE6664E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8261A605-FCBF-4D54-AC09-5248EBF93158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8261A605-FCBF-4D54-AC09-5248EBF93158}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8261A605-FCBF-4D54-AC09-5248EBF93158}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8261A605-FCBF-4D54-AC09-5248EBF93158}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67E15C52-4FF6-4149-9D90-2DFF24EA01EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67E15C52-4FF6-4149-9D90-2DFF24EA01EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67E15C52-4FF6-4149-9D90-2DFF24EA01EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67E15C52-4FF6-4149-9D90-2DFF24EA01EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{844166B0-B783-42B9-A507-D2F3A8DCC628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{844166B0-B783-42B9-A507-D2F3A8DCC628}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{844166B0-B783-42B9-A507-D2F3A8DCC628}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{844166B0-B783-42B9-A507-D2F3A8DCC628}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A998F8E4-797F-4852-8D38-CD322F637AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A998F8E4-797F-4852-8D38-CD322F637AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A998F8E4-797F-4852-8D38-CD322F637AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A998F8E4-797F-4852-8D38-CD322F637AA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EAA30FF-8911-4427-BFAC-9FC8BF8B3606}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1A675DB-487B-4119-9F47-1E4EF38CF158}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1A675DB-487B-4119-9F47-1E4EF38CF158}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1A675DB-487B-4119-9F47-1E4EF38CF158}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1A675DB-487B-4119-9F47-1E4EF38CF158}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B84D3D5-57C0-47E6-B763-3D51BB62AD7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B84D3D5-57C0-47E6-B763-3D51BB62AD7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B84D3D5-57C0-47E6-B763-3D51BB62AD7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B84D3D5-57C0-47E6-B763-3D51BB62AD7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAA75C96-57D9-4EDF-8DDF-392DB08B2047}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F454A4F9-AFA0-47F4-9690-75058B2C68DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED2ED9D3-EC2E-4573-AFE6-46385CD3CE8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7766AD72-71FF-45EF-B075-26509830EAF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7766AD72-71FF-45EF-B075-26509830EAF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7766AD72-71FF-45EF-B075-26509830EAF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7766AD72-71FF-45EF-B075-26509830EAF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5663631-6394-476B-BEDE-CC4A2E4E3BAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5663631-6394-476B-BEDE-CC4A2E4E3BAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5663631-6394-476B-BEDE-CC4A2E4E3BAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5663631-6394-476B-BEDE-CC4A2E4E3BAC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3ED7BCF1-34B9-49B7-9C25-0BC3304C0858} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{99E5069D-241F-48A6-8F29-404B4AED72BF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F9DF2357-81B4-4317-908E-512DA9395583} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{9EB75B87-2BE5-48E5-8988-A0929CE6664E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{8261A605-FCBF-4D54-AC09-5248EBF93158} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2BF05491-08EF-445E-ADBA-4D0DF54C0B6A}
+		SolutionGuid = {3E14E904-00F2-414A-BCF1-0EB09A861A21}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Data.Common/System.Data.Common.sln b/src/libraries/System.Data.Common/System.Data.Common.sln
index 8466903d08261c..c70eb8721636cc 100644
--- a/src/libraries/System.Data.Common/System.Data.Common.sln
+++ b/src/libraries/System.Data.Common/System.Data.Common.sln
@@ -1,60 +1,321 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common.Tests", "tests\System.Data.Common.Tests.csproj", "{B473F77D-4168-4123-932A-E88020B768FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{29EF8D53-8E84-4E49-B90F-5950A2FE7D54} = {29EF8D53-8E84-4E49-B90F-5950A2FE7D54}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common", "src\System.Data.Common.csproj", "{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D2DB0D6F-F65E-4174-B31E-27DC03137118} = {D2DB0D6F-F65E-4174-B31E-27DC03137118}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common", "ref\System.Data.Common.csproj", "{D2DB0D6F-F65E-4174-B31E-27DC03137118}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{5305244F-C52B-4772-A13D-C034213F3833}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj", "{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter", "..\System.ComponentModel.TypeConverter\src\System.ComponentModel.TypeConverter.csproj", "{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8D9E22AB-D525-41A8-8F26-F656F306713E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common", "ref\System.Data.Common.csproj", "{F865C526-79F8-403B-B5E4-52A90ECE21E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common", "src\System.Data.Common.csproj", "{C3F9A601-07D8-43A3-A3CA-7A002358A102}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Common.Tests", "tests\System.Data.Common.Tests.csproj", "{BEBD7B5B-9544-42EB-B878-F009560CAAF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A404332F-CCAA-4E22-94C1-635F7F19176F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6E353933-8CBD-467D-8FF1-00133C3F2036}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{68D868F6-1311-47A2-9DDE-22B64B5FF85E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{09129981-6B0D-44C7-9F0A-AD2426106332}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{649CA543-288D-4A8B-AED3-E470DC7FF866}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2FBD1B5D-0E5B-4D8C-A228-48B428725D67}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{12B0E17A-6957-425E-98E1-5F245010893A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9A105AFB-AA36-46E1-BC68-6724F5644D0C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{6E353933-8CBD-467D-8FF1-00133C3F2036} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{09129981-6B0D-44C7-9F0A-AD2426106332} = {2FBD1B5D-0E5B-4D8C-A228-48B428725D67}
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3} = {12B0E17A-6957-425E-98E1-5F245010893A}
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4} = {12B0E17A-6957-425E-98E1-5F245010893A}
+		{5305244F-C52B-4772-A13D-C034213F3833} = {9A105AFB-AA36-46E1-BC68-6724F5644D0C}
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3} = {9A105AFB-AA36-46E1-BC68-6724F5644D0C}
+		{A404332F-CCAA-4E22-94C1-635F7F19176F} = {9A105AFB-AA36-46E1-BC68-6724F5644D0C}
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818} = {9A105AFB-AA36-46E1-BC68-6724F5644D0C}
+		{649CA543-288D-4A8B-AED3-E470DC7FF866} = {9A105AFB-AA36-46E1-BC68-6724F5644D0C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B473F77D-4168-4123-932A-E88020B768FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B473F77D-4168-4123-932A-E88020B768FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B473F77D-4168-4123-932A-E88020B768FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B473F77D-4168-4123-932A-E88020B768FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29EF8D53-8E84-4E49-B90F-5950A2FE7D54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2DB0D6F-F65E-4174-B31E-27DC03137118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2DB0D6F-F65E-4174-B31E-27DC03137118}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2DB0D6F-F65E-4174-B31E-27DC03137118}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2DB0D6F-F65E-4174-B31E-27DC03137118}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D9E22AB-D525-41A8-8F26-F656F306713E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D9E22AB-D525-41A8-8F26-F656F306713E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D9E22AB-D525-41A8-8F26-F656F306713E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D9E22AB-D525-41A8-8F26-F656F306713E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Debug|Any CPU.Build.0 = Debug|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Debug|x64.ActiveCfg = Debug|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Debug|x64.Build.0 = Debug|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Debug|x86.ActiveCfg = Debug|x86
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Debug|x86.Build.0 = Debug|x86
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Release|Any CPU.ActiveCfg = Release|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Release|Any CPU.Build.0 = Release|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Release|x64.ActiveCfg = Release|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Release|x64.Build.0 = Release|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Release|x86.ActiveCfg = Release|x86
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Release|x86.Build.0 = Release|x86
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Checked|Any CPU.Build.0 = Checked|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Checked|x64.ActiveCfg = Checked|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Checked|x64.Build.0 = Checked|x64
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Checked|x86.ActiveCfg = Checked|x86
+		{F3DC1DF9-698A-4970-9A5E-AB946D6F763B}.Checked|x86.Build.0 = Checked|x86
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Debug|x64.Build.0 = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Debug|x86.Build.0 = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Release|x64.ActiveCfg = Release|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Release|x64.Build.0 = Release|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Release|x86.ActiveCfg = Release|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Release|x86.Build.0 = Release|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0BD22D2A-C12C-4641-8F12-73D21AAAFBA3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Debug|x64.Build.0 = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Debug|x86.Build.0 = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Release|x64.ActiveCfg = Release|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Release|x64.Build.0 = Release|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Release|x86.ActiveCfg = Release|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Release|x86.Build.0 = Release|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5305244F-C52B-4772-A13D-C034213F3833}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Release|x64.Build.0 = Release|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Release|x86.Build.0 = Release|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4C5DDB34-2F67-40F2-9D59-A3CEBAE35BE5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Debug|x64.Build.0 = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Debug|x86.Build.0 = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Release|x64.ActiveCfg = Release|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Release|x64.Build.0 = Release|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Release|x86.ActiveCfg = Release|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Release|x86.Build.0 = Release|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0FCF2BA6-A5B3-4E1C-A49A-424E77602313}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Debug|x64.Build.0 = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Debug|x86.Build.0 = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Release|x64.ActiveCfg = Release|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Release|x64.Build.0 = Release|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Release|x86.ActiveCfg = Release|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Release|x86.Build.0 = Release|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0AE3ABFE-6284-4119-A5DC-1844E6AB8E02}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Debug|x86.Build.0 = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Release|x64.Build.0 = Release|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Release|x86.Build.0 = Release|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F865C526-79F8-403B-B5E4-52A90ECE21E3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Debug|x64.Build.0 = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Debug|x86.Build.0 = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Release|x64.ActiveCfg = Release|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Release|x64.Build.0 = Release|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Release|x86.ActiveCfg = Release|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Release|x86.Build.0 = Release|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C3F9A601-07D8-43A3-A3CA-7A002358A102}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Debug|x64.Build.0 = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Debug|x86.Build.0 = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Release|x64.ActiveCfg = Release|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Release|x64.Build.0 = Release|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Release|x86.ActiveCfg = Release|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Release|x86.Build.0 = Release|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BEBD7B5B-9544-42EB-B878-F009560CAAF4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Debug|x64.Build.0 = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Debug|x86.Build.0 = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Release|x64.ActiveCfg = Release|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Release|x64.Build.0 = Release|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Release|x86.ActiveCfg = Release|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Release|x86.Build.0 = Release|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7AB121D2-0AAC-48E0-A834-6E220ECFEC4D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x64.Build.0 = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Debug|x86.Build.0 = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x64.ActiveCfg = Release|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x64.Build.0 = Release|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x86.ActiveCfg = Release|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Release|x86.Build.0 = Release|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A404332F-CCAA-4E22-94C1-635F7F19176F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x64.Build.0 = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Debug|x86.Build.0 = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x64.ActiveCfg = Release|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x64.Build.0 = Release|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Release|x86.Build.0 = Release|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6E353933-8CBD-467D-8FF1-00133C3F2036}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|x64.Build.0 = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Debug|x86.Build.0 = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Release|x64.ActiveCfg = Release|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Release|x64.Build.0 = Release|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Release|x86.ActiveCfg = Release|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Release|x86.Build.0 = Release|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{68D868F6-1311-47A2-9DDE-22B64B5FF85E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Debug|x64.Build.0 = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Debug|x86.Build.0 = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Release|x64.ActiveCfg = Release|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Release|x64.Build.0 = Release|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Release|x86.ActiveCfg = Release|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Release|x86.Build.0 = Release|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{09129981-6B0D-44C7-9F0A-AD2426106332}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Release|x64.Build.0 = Release|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Release|x86.Build.0 = Release|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BF66C27C-D1B1-4F86-A1E1-EDC63584E818}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Debug|x64.Build.0 = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Debug|x86.Build.0 = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Release|Any CPU.Build.0 = Release|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Release|x64.ActiveCfg = Release|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Release|x64.Build.0 = Release|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Release|x86.ActiveCfg = Release|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Release|x86.Build.0 = Release|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{649CA543-288D-4A8B-AED3-E470DC7FF866}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B473F77D-4168-4123-932A-E88020B768FA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{29EF8D53-8E84-4E49-B90F-5950A2FE7D54} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D2DB0D6F-F65E-4174-B31E-27DC03137118} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{8D9E22AB-D525-41A8-8F26-F656F306713E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {51E2A4D2-7B34-4DC2-977E-557E9A3D42B6}
+		SolutionGuid = {C1241AC3-6D55-48A6-9502-C46F806889AE}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
index ed7b88edebc5b9..887acb7e703eaa 100644
--- a/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
+++ b/src/libraries/System.Data.DataSetExtensions/System.Data.DataSetExtensions.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions.Tests", "tests\System.Data.DataSetExtensions.Tests.csproj", "{2B38992F-9979-485F-B104-38C476D0B706}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D18478-BE75-4F54-8080-A5C3047D776B} = {50D18478-BE75-4F54-8080-A5C3047D776B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{09677ECF-3068-472F-B9CF-43E1E4F081D8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions", "src\System.Data.DataSetExtensions.csproj", "{50D18478-BE75-4F54-8080-A5C3047D776B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50A5A8BC-C6A9-4000-8B52-667BEE00459D} = {50A5A8BC-C6A9-4000-8B52-667BEE00459D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{8F257432-F9E5-41F4-9D5E-8435E8D108D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions", "ref\System.Data.DataSetExtensions.csproj", "{50A5A8BC-C6A9-4000-8B52-667BEE00459D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions", "ref\System.Data.DataSetExtensions.csproj", "{8A0AA93A-ED36-4384-827E-F4D6E1E71B24}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions", "src\System.Data.DataSetExtensions.csproj", "{5817F83A-8819-420F-B056-047D6515A02C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.DataSetExtensions.Tests", "tests\System.Data.DataSetExtensions.Tests.csproj", "{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{657BEF08-3BC4-47E2-A4A3-D59704D9A26B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1427FFC7-99E8-47B9-BE94-2FC03B9792E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9277BDD6-3AD3-4440-A596-8268D040F277}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{62E71EEB-3918-4CF7-92F1-681F46211A9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{CAA73749-CBE9-497C-BE13-A15C3BA8EFD3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7F0C0671-7588-4AF4-8EDF-1F50B9694750}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{87CA013D-0B77-47E9-85FE-4937AFE9B011}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5640B497-0274-40DE-9E8A-9FC326DB9056}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{09677ECF-3068-472F-B9CF-43E1E4F081D8} = {7F0C0671-7588-4AF4-8EDF-1F50B9694750}
+		{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A} = {7F0C0671-7588-4AF4-8EDF-1F50B9694750}
+		{8F257432-F9E5-41F4-9D5E-8435E8D108D2} = {87CA013D-0B77-47E9-85FE-4937AFE9B011}
+		{8A0AA93A-ED36-4384-827E-F4D6E1E71B24} = {87CA013D-0B77-47E9-85FE-4937AFE9B011}
+		{657BEF08-3BC4-47E2-A4A3-D59704D9A26B} = {87CA013D-0B77-47E9-85FE-4937AFE9B011}
+		{62E71EEB-3918-4CF7-92F1-681F46211A9B} = {87CA013D-0B77-47E9-85FE-4937AFE9B011}
+		{CAA73749-CBE9-497C-BE13-A15C3BA8EFD3} = {87CA013D-0B77-47E9-85FE-4937AFE9B011}
+		{5817F83A-8819-420F-B056-047D6515A02C} = {5640B497-0274-40DE-9E8A-9FC326DB9056}
+		{9277BDD6-3AD3-4440-A596-8268D040F277} = {5640B497-0274-40DE-9E8A-9FC326DB9056}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2B38992F-9979-485F-B104-38C476D0B706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B38992F-9979-485F-B104-38C476D0B706}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B38992F-9979-485F-B104-38C476D0B706}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B38992F-9979-485F-B104-38C476D0B706}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50D18478-BE75-4F54-8080-A5C3047D776B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50D18478-BE75-4F54-8080-A5C3047D776B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50D18478-BE75-4F54-8080-A5C3047D776B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50D18478-BE75-4F54-8080-A5C3047D776B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50A5A8BC-C6A9-4000-8B52-667BEE00459D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1427FFC7-99E8-47B9-BE94-2FC03B9792E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1427FFC7-99E8-47B9-BE94-2FC03B9792E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1427FFC7-99E8-47B9-BE94-2FC03B9792E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1427FFC7-99E8-47B9-BE94-2FC03B9792E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09677ECF-3068-472F-B9CF-43E1E4F081D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09677ECF-3068-472F-B9CF-43E1E4F081D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09677ECF-3068-472F-B9CF-43E1E4F081D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09677ECF-3068-472F-B9CF-43E1E4F081D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F257432-F9E5-41F4-9D5E-8435E8D108D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F257432-F9E5-41F4-9D5E-8435E8D108D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F257432-F9E5-41F4-9D5E-8435E8D108D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F257432-F9E5-41F4-9D5E-8435E8D108D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A0AA93A-ED36-4384-827E-F4D6E1E71B24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A0AA93A-ED36-4384-827E-F4D6E1E71B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A0AA93A-ED36-4384-827E-F4D6E1E71B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A0AA93A-ED36-4384-827E-F4D6E1E71B24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5817F83A-8819-420F-B056-047D6515A02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5817F83A-8819-420F-B056-047D6515A02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5817F83A-8819-420F-B056-047D6515A02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5817F83A-8819-420F-B056-047D6515A02C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40D58ACE-1A94-4D4F-8829-4ABC8A7B5B0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{657BEF08-3BC4-47E2-A4A3-D59704D9A26B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9277BDD6-3AD3-4440-A596-8268D040F277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9277BDD6-3AD3-4440-A596-8268D040F277}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9277BDD6-3AD3-4440-A596-8268D040F277}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9277BDD6-3AD3-4440-A596-8268D040F277}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62E71EEB-3918-4CF7-92F1-681F46211A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62E71EEB-3918-4CF7-92F1-681F46211A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62E71EEB-3918-4CF7-92F1-681F46211A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62E71EEB-3918-4CF7-92F1-681F46211A9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAA73749-CBE9-497C-BE13-A15C3BA8EFD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAA73749-CBE9-497C-BE13-A15C3BA8EFD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAA73749-CBE9-497C-BE13-A15C3BA8EFD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAA73749-CBE9-497C-BE13-A15C3BA8EFD3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2B38992F-9979-485F-B104-38C476D0B706} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{50D18478-BE75-4F54-8080-A5C3047D776B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{50A5A8BC-C6A9-4000-8B52-667BEE00459D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{1427FFC7-99E8-47B9-BE94-2FC03B9792E7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {63C824F4-CE81-403D-BA02-4D3AE20B3A9E}
+		SolutionGuid = {75CB77F6-4A71-40F5-84E9-44DC5ABC6B4B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
index 331320fd3a437c..7d1b23761e63b3 100644
--- a/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
+++ b/src/libraries/System.Data.Odbc/System.Data.Odbc.sln
@@ -1,60 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc.Tests", "tests\System.Data.Odbc.Tests.csproj", "{F3E72F35-0351-4D67-2209-725BCAD807BA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7BAD100F-AD6B-490A-AF7C-8E3854E812C0} = {7BAD100F-AD6B-490A-AF7C-8E3854E812C0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{04309507-4EF4-4B93-9C4C-B2B538227C65}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "src\System.Data.Odbc.csproj", "{7BAD100F-AD6B-490A-AF7C-8E3854E812C0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D589374B-3331-4660-8DFB-512D66F8EC63} = {D589374B-3331-4660-8DFB-512D66F8EC63}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{60C41FE0-6923-4794-8AD8-6839DBC92329}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "ref\System.Data.Odbc.csproj", "{D589374B-3331-4660-8DFB-512D66F8EC63}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "ref\System.Data.Odbc.csproj", "{531EA13B-CADA-4EBF-840B-4CE996247317}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "src\System.Data.Odbc.csproj", "{EDE27BD9-9134-4118-94BD-C9782811684D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc.Tests", "tests\System.Data.Odbc.Tests.csproj", "{B0451507-A304-47CB-B14F-257E44B8AC18}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9850C6FD-DC3E-4568-97CC-6B14DF58C232}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3B83B797-AB71-4C80-A21B-5D65D317A96C}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3EEBB4A0-712B-4937-A716-248CC4BAFF9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{A669518C-2F93-47EC-BB1C-6A90B76E7468}"
+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", "{AF7E77CA-5A6B-429B-BC34-1857F75FD0C0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9780DE3F-B510-4678-9D22-5A4E7E4AF826}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4391B6E4-102E-47F3-B845-EA43D91C75E5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{04309507-4EF4-4B93-9C4C-B2B538227C65} = {AF7E77CA-5A6B-429B-BC34-1857F75FD0C0}
+		{B0451507-A304-47CB-B14F-257E44B8AC18} = {AF7E77CA-5A6B-429B-BC34-1857F75FD0C0}
+		{60C41FE0-6923-4794-8AD8-6839DBC92329} = {9780DE3F-B510-4678-9D22-5A4E7E4AF826}
+		{531EA13B-CADA-4EBF-840B-4CE996247317} = {9780DE3F-B510-4678-9D22-5A4E7E4AF826}
+		{9850C6FD-DC3E-4568-97CC-6B14DF58C232} = {9780DE3F-B510-4678-9D22-5A4E7E4AF826}
+		{3EEBB4A0-712B-4937-A716-248CC4BAFF9B} = {9780DE3F-B510-4678-9D22-5A4E7E4AF826}
+		{A669518C-2F93-47EC-BB1C-6A90B76E7468} = {9780DE3F-B510-4678-9D22-5A4E7E4AF826}
+		{EDE27BD9-9134-4118-94BD-C9782811684D} = {4391B6E4-102E-47F3-B845-EA43D91C75E5}
+		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE} = {4391B6E4-102E-47F3-B845-EA43D91C75E5}
+		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8} = {4391B6E4-102E-47F3-B845-EA43D91C75E5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F3E72F35-0351-4D67-2209-725BCAD807BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3E72F35-0351-4D67-2209-725BCAD807BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3E72F35-0351-4D67-2209-725BCAD807BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3E72F35-0351-4D67-2209-725BCAD807BA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BAD100F-AD6B-490A-AF7C-8E3854E812C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D589374B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D589374B-3331-4660-8DFB-512D66F8EC63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D589374B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D589374B-3331-4660-8DFB-512D66F8EC63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B83B797-AB71-4C80-A21B-5D65D317A96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B83B797-AB71-4C80-A21B-5D65D317A96C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B83B797-AB71-4C80-A21B-5D65D317A96C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B83B797-AB71-4C80-A21B-5D65D317A96C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04309507-4EF4-4B93-9C4C-B2B538227C65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04309507-4EF4-4B93-9C4C-B2B538227C65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04309507-4EF4-4B93-9C4C-B2B538227C65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04309507-4EF4-4B93-9C4C-B2B538227C65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60C41FE0-6923-4794-8AD8-6839DBC92329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60C41FE0-6923-4794-8AD8-6839DBC92329}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60C41FE0-6923-4794-8AD8-6839DBC92329}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60C41FE0-6923-4794-8AD8-6839DBC92329}.Release|Any CPU.Build.0 = Release|Any CPU
+		{531EA13B-CADA-4EBF-840B-4CE996247317}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{531EA13B-CADA-4EBF-840B-4CE996247317}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{531EA13B-CADA-4EBF-840B-4CE996247317}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{531EA13B-CADA-4EBF-840B-4CE996247317}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDE27BD9-9134-4118-94BD-C9782811684D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDE27BD9-9134-4118-94BD-C9782811684D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDE27BD9-9134-4118-94BD-C9782811684D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDE27BD9-9134-4118-94BD-C9782811684D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0451507-A304-47CB-B14F-257E44B8AC18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0451507-A304-47CB-B14F-257E44B8AC18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0451507-A304-47CB-B14F-257E44B8AC18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0451507-A304-47CB-B14F-257E44B8AC18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9850C6FD-DC3E-4568-97CC-6B14DF58C232}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9850C6FD-DC3E-4568-97CC-6B14DF58C232}.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
+		{F0E1F779-C711-4AA0-A938-BA1EB1D22ACE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EEBB4A0-712B-4937-A716-248CC4BAFF9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EEBB4A0-712B-4937-A716-248CC4BAFF9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EEBB4A0-712B-4937-A716-248CC4BAFF9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EEBB4A0-712B-4937-A716-248CC4BAFF9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A669518C-2F93-47EC-BB1C-6A90B76E7468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A669518C-2F93-47EC-BB1C-6A90B76E7468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A669518C-2F93-47EC-BB1C-6A90B76E7468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A669518C-2F93-47EC-BB1C-6A90B76E7468}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD3A8348-A2AC-468A-B8D9-B639190B0FD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F3E72F35-0351-4D67-2209-725BCAD807BA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7BAD100F-AD6B-490A-AF7C-8E3854E812C0} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D589374B-3331-4660-8DFB-512D66F8EC63} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3B83B797-AB71-4C80-A21B-5D65D317A96C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {57A3CDB1-B4C0-43A9-85CB-537EE69CD727}
+		SolutionGuid = {D222D648-ABA4-4D02-9230-A2B2CC3F3C39}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
index 3c9cdcabc4aef8..eab6f9c8292daa 100644
--- a/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
+++ b/src/libraries/System.Data.OleDb/System.Data.Oledb.sln
@@ -1,60 +1,198 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.OleDb.Tests", "tests\System.Data.OleDb.Tests.csproj", "{73C7A14F-C3C5-44EA-AB02-05BFBA55722C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D909B69D-8F3B-4551-A355-8FFF6A308CF6} = {D909B69D-8F3B-4551-A355-8FFF6A308CF6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{30142600-D924-4FDC-9A98-D621C3A2CCEA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.OleDb", "src\System.Data.OleDb.csproj", "{D909B69D-8F3B-4551-A355-8FFF6A308CF6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78} = {EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{A44A98A9-0FF4-40C2-A85B-F57E7BBA6621}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.OleDb", "ref\System.Data.OleDb.csproj", "{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{B487B420-3D36-41E2-8989-3D4FF9F78A61}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.OleDb", "ref\System.Data.OleDb.csproj", "{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{474DBDE9-7887-46D0-A2BF-EB531D16B958}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.OleDb", "src\System.Data.OleDb.csproj", "{9C557B87-DEE3-4B28-A82D-796418B3F608}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.OleDb.Tests", "tests\System.Data.OleDb.Tests.csproj", "{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "..\System.Diagnostics.PerformanceCounter\ref\System.Diagnostics.PerformanceCounter.csproj", "{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "..\System.Diagnostics.PerformanceCounter\src\System.Diagnostics.PerformanceCounter.csproj", "{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{C4B1668A-2512-4832-A298-3A10230C8B82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{E9C139C8-4D83-45C4-A0F9-941FEC0E1B1A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{777B3BFD-934B-4E69-84F6-1F8E1210998E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{31AE7C18-9A29-4F1A-BE6E-6907CB954285}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E4C9D7F9-D215-4F11-8D33-17611FE5D8F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{2C8F5CCC-53D0-49CE-BF5B-BBC3E2771FF6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{EF8D1526-9463-401B-9EAE-D4B98C86E046}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{15628477-9D25-41FA-81B0-59D43D1363F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C73C11A5-863A-440D-B568-00CA5E7C9DA0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{877B4329-854A-412F-B631-6315D77F9C8A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{155BD2D0-E9F1-4207-A82B-1C82B3683C7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{A99032CC-E819-436D-8A27-D413E8445E1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{A3AC9584-763B-4686-B6D8-49140FC62EC4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{37CB0B5C-86A4-4179-B507-862A3DE45CF0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C2E12295-5485-4976-B0FA-D2621787D36A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AB098FBC-5608-42C3-BC77-27EA6244894C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA} = {37CB0B5C-86A4-4179-B507-862A3DE45CF0}
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A} = {37CB0B5C-86A4-4179-B507-862A3DE45CF0}
+		{A44A98A9-0FF4-40C2-A85B-F57E7BBA6621} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{C4B1668A-2512-4832-A298-3A10230C8B82} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{E9C139C8-4D83-45C4-A0F9-941FEC0E1B1A} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{E4C9D7F9-D215-4F11-8D33-17611FE5D8F4} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{155BD2D0-E9F1-4207-A82B-1C82B3683C7B} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06} = {C2E12295-5485-4976-B0FA-D2621787D36A}
+		{B487B420-3D36-41E2-8989-3D4FF9F78A61} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{9C557B87-DEE3-4B28-A82D-796418B3F608} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{777B3BFD-934B-4E69-84F6-1F8E1210998E} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{31AE7C18-9A29-4F1A-BE6E-6907CB954285} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{2C8F5CCC-53D0-49CE-BF5B-BBC3E2771FF6} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{15628477-9D25-41FA-81B0-59D43D1363F4} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{877B4329-854A-412F-B631-6315D77F9C8A} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{A99032CC-E819-436D-8A27-D413E8445E1B} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4} = {AB098FBC-5608-42C3-BC77-27EA6244894C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73C7A14F-C3C5-44EA-AB02-05BFBA55722C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D909B69D-8F3B-4551-A355-8FFF6A308CF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{474DBDE9-7887-46D0-A2BF-EB531D16B958}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{474DBDE9-7887-46D0-A2BF-EB531D16B958}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{474DBDE9-7887-46D0-A2BF-EB531D16B958}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{474DBDE9-7887-46D0-A2BF-EB531D16B958}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30142600-D924-4FDC-9A98-D621C3A2CCEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A44A98A9-0FF4-40C2-A85B-F57E7BBA6621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A44A98A9-0FF4-40C2-A85B-F57E7BBA6621}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A44A98A9-0FF4-40C2-A85B-F57E7BBA6621}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A44A98A9-0FF4-40C2-A85B-F57E7BBA6621}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B487B420-3D36-41E2-8989-3D4FF9F78A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B487B420-3D36-41E2-8989-3D4FF9F78A61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B487B420-3D36-41E2-8989-3D4FF9F78A61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B487B420-3D36-41E2-8989-3D4FF9F78A61}.Release|Any CPU.Build.0 = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{048AD79E-A0A9-4C0E-8942-4778BBE4B2F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{636E099B-BFAB-4C0E-B9D8-09BB1FE85B45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55F3CDEC-EA5D-4483-AD1A-47A0DC4B5222}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C557B87-DEE3-4B28-A82D-796418B3F608}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84CF0BC6-CFDF-4A19-AA48-0F28FB11BC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5BFD2E9-5399-4D16-901A-554E1DF2D6E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{362A9152-D46A-4DD0-8EB7-D36FC95D1AF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4B1668A-2512-4832-A298-3A10230C8B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4B1668A-2512-4832-A298-3A10230C8B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4B1668A-2512-4832-A298-3A10230C8B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4B1668A-2512-4832-A298-3A10230C8B82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9C139C8-4D83-45C4-A0F9-941FEC0E1B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9C139C8-4D83-45C4-A0F9-941FEC0E1B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9C139C8-4D83-45C4-A0F9-941FEC0E1B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9C139C8-4D83-45C4-A0F9-941FEC0E1B1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{777B3BFD-934B-4E69-84F6-1F8E1210998E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{777B3BFD-934B-4E69-84F6-1F8E1210998E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{777B3BFD-934B-4E69-84F6-1F8E1210998E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{777B3BFD-934B-4E69-84F6-1F8E1210998E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86F4BEE6-73B9-4788-8076-D01C4A1D9A1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31AE7C18-9A29-4F1A-BE6E-6907CB954285}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4C9D7F9-D215-4F11-8D33-17611FE5D8F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4C9D7F9-D215-4F11-8D33-17611FE5D8F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4C9D7F9-D215-4F11-8D33-17611FE5D8F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4C9D7F9-D215-4F11-8D33-17611FE5D8F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C8F5CCC-53D0-49CE-BF5B-BBC3E2771FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C8F5CCC-53D0-49CE-BF5B-BBC3E2771FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C8F5CCC-53D0-49CE-BF5B-BBC3E2771FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C8F5CCC-53D0-49CE-BF5B-BBC3E2771FF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF8D1526-9463-401B-9EAE-D4B98C86E046}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15628477-9D25-41FA-81B0-59D43D1363F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C73C11A5-863A-440D-B568-00CA5E7C9DA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{877B4329-854A-412F-B631-6315D77F9C8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{155BD2D0-E9F1-4207-A82B-1C82B3683C7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{155BD2D0-E9F1-4207-A82B-1C82B3683C7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{155BD2D0-E9F1-4207-A82B-1C82B3683C7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{155BD2D0-E9F1-4207-A82B-1C82B3683C7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A99032CC-E819-436D-8A27-D413E8445E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A99032CC-E819-436D-8A27-D413E8445E1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A99032CC-E819-436D-8A27-D413E8445E1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A99032CC-E819-436D-8A27-D413E8445E1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7C9E59C-0B7B-491E-9FC5-63A29290EE06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3AC9584-763B-4686-B6D8-49140FC62EC4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{73C7A14F-C3C5-44EA-AB02-05BFBA55722C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D909B69D-8F3B-4551-A355-8FFF6A308CF6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{EF4F0844-7AAD-4B0C-A29C-37E1F92D2D78} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{474DBDE9-7887-46D0-A2BF-EB531D16B958} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {04C9232C-0656-4BA5-9836-7DAE3DD4057C}
+		SolutionGuid = {4895E2D2-31A2-4EB8-9C53-04C408F62DC4}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
index b39190e9ac5bb0..f92fd9a4f313e3 100644
--- a/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
+++ b/src/libraries/System.Diagnostics.Contracts/System.Diagnostics.Contracts.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contracts.Tests", "tests\System.Diagnostics.Contracts.Tests.csproj", "{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}"
-	ProjectSection(ProjectDependencies) = postProject
-		{13426B04-D1AC-4423-8519-F3EB44943B9D} = {13426B04-D1AC-4423-8519-F3EB44943B9D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{D5A81248-C2F8-464A-8EA4-2AB2528206BC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contracts", "src\System.Diagnostics.Contracts.csproj", "{13426B04-D1AC-4423-8519-F3EB44943B9D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5E0B1760-8753-467A-8B10-66B8994220DB} = {5E0B1760-8753-467A-8B10-66B8994220DB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contracts", "ref\System.Diagnostics.Contracts.csproj", "{5E0B1760-8753-467A-8B10-66B8994220DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{BD5D6D24-5294-479D-B877-29CDBB421C1D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contracts", "ref\System.Diagnostics.Contracts.csproj", "{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contracts", "src\System.Diagnostics.Contracts.csproj", "{158DD2BA-5789-49B8-A801-77EF5D4FD324}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Contracts.Tests", "tests\System.Diagnostics.Contracts.Tests.csproj", "{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{47C52D86-6813-49C8-8C46-C5C2D602F01C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1A955DE0-2DA1-4122-B181-D047F6A6D12D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D9FA3031-336F-4B88-B2E3-07D2FC33CF15}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DD907507-D89A-4E20-BE5C-0FA44D2F70E1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{423C8797-0F61-4EF9-A221-E478F0E8D54C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC} = {D9FA3031-336F-4B88-B2E3-07D2FC33CF15}
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324} = {D9FA3031-336F-4B88-B2E3-07D2FC33CF15}
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB} = {D9FA3031-336F-4B88-B2E3-07D2FC33CF15}
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE} = {DD907507-D89A-4E20-BE5C-0FA44D2F70E1}
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50} = {DD907507-D89A-4E20-BE5C-0FA44D2F70E1}
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D} = {423C8797-0F61-4EF9-A221-E478F0E8D54C}
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0} = {423C8797-0F61-4EF9-A221-E478F0E8D54C}
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE} = {423C8797-0F61-4EF9-A221-E478F0E8D54C}
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D} = {423C8797-0F61-4EF9-A221-E478F0E8D54C}
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C} = {423C8797-0F61-4EF9-A221-E478F0E8D54C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13426B04-D1AC-4423-8519-F3EB44943B9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13426B04-D1AC-4423-8519-F3EB44943B9D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5E0B1760-8753-467A-8B10-66B8994220DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5E0B1760-8753-467A-8B10-66B8994220DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47C52D86-6813-49C8-8C46-C5C2D602F01C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47C52D86-6813-49C8-8C46-C5C2D602F01C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47C52D86-6813-49C8-8C46-C5C2D602F01C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47C52D86-6813-49C8-8C46-C5C2D602F01C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Debug|Any CPU.Build.0 = Debug|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Debug|x64.ActiveCfg = Debug|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Debug|x64.Build.0 = Debug|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Debug|x86.ActiveCfg = Debug|x86
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Debug|x86.Build.0 = Debug|x86
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Release|Any CPU.ActiveCfg = Release|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Release|Any CPU.Build.0 = Release|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Release|x64.ActiveCfg = Release|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Release|x64.Build.0 = Release|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Release|x86.ActiveCfg = Release|x86
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Release|x86.Build.0 = Release|x86
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Checked|Any CPU.Build.0 = Checked|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Checked|x64.ActiveCfg = Checked|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Checked|x64.Build.0 = Checked|x64
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Checked|x86.ActiveCfg = Checked|x86
+		{D5A81248-C2F8-464A-8EA4-2AB2528206BC}.Checked|x86.Build.0 = Checked|x86
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Debug|x64.Build.0 = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Debug|x86.Build.0 = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Release|x64.ActiveCfg = Release|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Release|x64.Build.0 = Release|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Release|x86.ActiveCfg = Release|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Release|x86.Build.0 = Release|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E4B95B10-EC2A-4874-8E71-858A90A4BDFE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Release|x64.Build.0 = Release|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Release|x86.Build.0 = Release|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BD5D6D24-5294-479D-B877-29CDBB421C1D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Debug|x64.Build.0 = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Release|x64.Build.0 = Release|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Release|x86.Build.0 = Release|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DD15B8D0-013A-43B3-AC3D-1B0D626B35E0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Debug|x64.Build.0 = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Debug|x86.Build.0 = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Release|Any CPU.Build.0 = Release|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Release|x64.ActiveCfg = Release|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Release|x64.Build.0 = Release|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Release|x86.ActiveCfg = Release|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Release|x86.Build.0 = Release|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{158DD2BA-5789-49B8-A801-77EF5D4FD324}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Release|x64.Build.0 = Release|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Release|x86.Build.0 = Release|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2F113EAD-602B-4EBD-97E4-24C97CDFEB50}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x64.Build.0 = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Debug|x86.Build.0 = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x64.ActiveCfg = Release|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x64.Build.0 = Release|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x86.ActiveCfg = Release|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Release|x86.Build.0 = Release|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CCA28A44-CFF6-4FAB-B383-DF6E426CCCFE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x64.Build.0 = Release|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Release|x86.Build.0 = Release|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE9500E9-92BE-4357-8CE9-876DCF5CEFEB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Debug|x86.Build.0 = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Release|x64.Build.0 = Release|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Release|x86.Build.0 = Release|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1A955DE0-2DA1-4122-B181-D047F6A6D12D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Debug|x64.Build.0 = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Debug|x86.Build.0 = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Release|x64.ActiveCfg = Release|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Release|x64.Build.0 = Release|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Release|x86.ActiveCfg = Release|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Release|x86.Build.0 = Release|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B45C7A35-16F6-4DCC-816B-11C09AEC1E2C}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0C4E7FF1-54C6-49B7-9700-18F5F3EB8E65} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{13426B04-D1AC-4423-8519-F3EB44943B9D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{5E0B1760-8753-467A-8B10-66B8994220DB} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{47C52D86-6813-49C8-8C46-C5C2D602F01C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E5F078A1-ACC4-4B1B-BC51-ECD056BE4019}
+		SolutionGuid = {D03A9093-136B-4C69-AFC1-106658815511}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
index 70d6cc8b6f2e9d..ecd12e97e0e51a 100644
--- a/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
+++ b/src/libraries/System.Diagnostics.Debug/System.Diagnostics.Debug.sln
@@ -1,60 +1,267 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests.csproj", "{56F67E92-E606-435E-A00F-003CBFB26945}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8} = {E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{6CBF7573-4865-4DD2-A38B-74003FB43C9E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug", "src\System.Diagnostics.Debug.csproj", "{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2CBC7A79-EDF5-4552-B25D-8E32E367571E} = {2CBC7A79-EDF5-4552-B25D-8E32E367571E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1C01EFBD-2332-4392-BB4A-918178861EDC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug", "ref\System.Diagnostics.Debug.csproj", "{2CBC7A79-EDF5-4552-B25D-8E32E367571E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug", "ref\System.Diagnostics.Debug.csproj", "{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug", "src\System.Diagnostics.Debug.csproj", "{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Debug.Tests", "tests\System.Diagnostics.Debug.Tests.csproj", "{5B121A9E-061D-4FED-AA3A-26054F41E2B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{78D6FA35-3154-485A-A442-222733D20670}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{C4E264C7-91E7-4100-BA47-47CB12964025}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{FF70783E-BAC9-47BD-BC68-2561A20C89EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{C61770DF-C267-4B18-8822-D9C062FE806E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2F3C2875-BCC7-42B7-B125-E08656C53BB9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{81C0CA34-11E2-4E9C-9FD9-7989C4151B36}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4A940D5C-D81F-4453-A7DD-9DA5BD4A3BF6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E} = {2F3C2875-BCC7-42B7-B125-E08656C53BB9}
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516} = {2F3C2875-BCC7-42B7-B125-E08656C53BB9}
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04} = {2F3C2875-BCC7-42B7-B125-E08656C53BB9}
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B} = {2F3C2875-BCC7-42B7-B125-E08656C53BB9}
+		{C4E264C7-91E7-4100-BA47-47CB12964025} = {2F3C2875-BCC7-42B7-B125-E08656C53BB9}
+		{C61770DF-C267-4B18-8822-D9C062FE806E} = {2F3C2875-BCC7-42B7-B125-E08656C53BB9}
+		{1C01EFBD-2332-4392-BB4A-918178861EDC} = {81C0CA34-11E2-4E9C-9FD9-7989C4151B36}
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4} = {81C0CA34-11E2-4E9C-9FD9-7989C4151B36}
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7} = {4A940D5C-D81F-4453-A7DD-9DA5BD4A3BF6}
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D} = {4A940D5C-D81F-4453-A7DD-9DA5BD4A3BF6}
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7} = {4A940D5C-D81F-4453-A7DD-9DA5BD4A3BF6}
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA} = {4A940D5C-D81F-4453-A7DD-9DA5BD4A3BF6}
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF} = {4A940D5C-D81F-4453-A7DD-9DA5BD4A3BF6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{56F67E92-E606-435E-A00F-003CBFB26945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56F67E92-E606-435E-A00F-003CBFB26945}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56F67E92-E606-435E-A00F-003CBFB26945}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56F67E92-E606-435E-A00F-003CBFB26945}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CBC7A79-EDF5-4552-B25D-8E32E367571E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78D6FA35-3154-485A-A442-222733D20670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78D6FA35-3154-485A-A442-222733D20670}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78D6FA35-3154-485A-A442-222733D20670}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78D6FA35-3154-485A-A442-222733D20670}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Debug|Any CPU.Build.0 = Debug|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Debug|x64.ActiveCfg = Debug|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Debug|x64.Build.0 = Debug|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Debug|x86.ActiveCfg = Debug|x86
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Debug|x86.Build.0 = Debug|x86
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Release|Any CPU.ActiveCfg = Release|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Release|Any CPU.Build.0 = Release|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Release|x64.ActiveCfg = Release|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Release|x64.Build.0 = Release|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Release|x86.ActiveCfg = Release|x86
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Release|x86.Build.0 = Release|x86
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Checked|Any CPU.Build.0 = Checked|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Checked|x64.ActiveCfg = Checked|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Checked|x64.Build.0 = Checked|x64
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Checked|x86.ActiveCfg = Checked|x86
+		{6CBF7573-4865-4DD2-A38B-74003FB43C9E}.Checked|x86.Build.0 = Checked|x86
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Debug|x86.Build.0 = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Release|x64.Build.0 = Release|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Release|x86.Build.0 = Release|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1C01EFBD-2332-4392-BB4A-918178861EDC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Debug|x64.Build.0 = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Debug|x86.Build.0 = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Release|x64.Build.0 = Release|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Release|x86.ActiveCfg = Release|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Release|x86.Build.0 = Release|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6D535BF6-DF7F-4B19-AF0C-D29ACCA6D8A7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Release|x64.Build.0 = Release|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Release|x86.Build.0 = Release|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2B2AFDCB-BD41-4855-BCB0-B675B8E6CD0D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Debug|x64.Build.0 = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Debug|x86.Build.0 = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Release|x64.ActiveCfg = Release|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Release|x64.Build.0 = Release|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Release|x86.ActiveCfg = Release|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Release|x86.Build.0 = Release|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{05AA43B5-733A-43EF-8CE5-8BF4A18BD516}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Release|x64.Build.0 = Release|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Release|x86.Build.0 = Release|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5B121A9E-061D-4FED-AA3A-26054F41E2B4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Debug|x64.Build.0 = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Debug|x86.Build.0 = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Release|x64.ActiveCfg = Release|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Release|x64.Build.0 = Release|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Release|x86.ActiveCfg = Release|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Release|x86.Build.0 = Release|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8CCE7756-F004-4EF2-ABCE-0DDD03D5BE04}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x64.Build.0 = Release|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Release|x86.Build.0 = Release|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FD976FDB-4CEE-4D91-B2A0-9264F391D2B7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x64.Build.0 = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Debug|x86.Build.0 = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x64.ActiveCfg = Release|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x64.Build.0 = Release|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x86.ActiveCfg = Release|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Release|x86.Build.0 = Release|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5DF0CE4D-A949-457F-9FD9-8A8AB8E4809B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Release|x64.Build.0 = Release|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Release|x86.Build.0 = Release|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C4E264C7-91E7-4100-BA47-47CB12964025}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Debug|x86.Build.0 = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Release|x64.Build.0 = Release|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Release|x86.ActiveCfg = Release|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Release|x86.Build.0 = Release|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FF70783E-BAC9-47BD-BC68-2561A20C89EA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Debug|x86.Build.0 = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Release|x64.Build.0 = Release|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Release|x86.Build.0 = Release|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{60A6EA9F-2A78-41BC-8478-00ECE738F6AF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Debug|x64.Build.0 = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Debug|x86.Build.0 = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Release|x64.ActiveCfg = Release|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Release|x64.Build.0 = Release|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Release|x86.ActiveCfg = Release|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Release|x86.Build.0 = Release|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C61770DF-C267-4B18-8822-D9C062FE806E}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{56F67E92-E606-435E-A00F-003CBFB26945} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2CBC7A79-EDF5-4552-B25D-8E32E367571E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{78D6FA35-3154-485A-A442-222733D20670} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {26B00BA4-BF24-44D3-9D2B-A983C8FCD229}
+		SolutionGuid = {E0E463DC-7C7C-48D9-9806-88AFFFA1F54F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
index 206cdf7b3829d0..666e1ca8186a0e 100644
--- a/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
+++ b/src/libraries/System.Diagnostics.DiagnosticSource/System.Diagnostics.DiagnosticSource.sln
@@ -1,60 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource.Tests", "tests\System.Diagnostics.DiagnosticSource.Tests.csproj", "{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F24D3391-2928-4E83-AADE-B34423498750} = {F24D3391-2928-4E83-AADE-B34423498750}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{39A7D80C-9DEE-4E34-AC4B-768CD4D2D77F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "src\System.Diagnostics.DiagnosticSource.csproj", "{F24D3391-2928-4E83-AADE-B34423498750}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9} = {3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{EE434B59-C7F4-479F-8F4B-FC2ACB182CCB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "ref\System.Diagnostics.DiagnosticSource.csproj", "{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "ref\System.Diagnostics.DiagnosticSource.csproj", "{424489A3-270A-4AD2-A3C4-4F726BF5D490}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource", "src\System.Diagnostics.DiagnosticSource.csproj", "{C841EE65-4F8E-4779-987C-7E64BACFAC59}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource.Tests", "tests\System.Diagnostics.DiagnosticSource.Tests.csproj", "{81E7CBE3-9763-4935-94D4-512480A85C46}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.DiagnosticSource.Switches.Tests", "tests\TestWithConfigSwitches\System.Diagnostics.DiagnosticSource.Switches.Tests.csproj", "{95B7A616-C472-47CA-BC91-E88FB763A78B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{EA11A15E-C713-4194-8A7D-C4949F769EF8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D2A7F166-96E6-4E0B-89CA-8869866AF10B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1C28E125-BC75-4E11-B69A-0E56BD615C57}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1A43206C-552E-43F8-ACD3-428DA68046E4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{AA422FF6-101E-4203-955D-833F14CD54ED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{322607EA-0DEC-45D2-BFA4-A6AE2276DEE0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D0A9B32B-EF5D-41FC-978C-F64E93D2D595}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27293BE9-162F-4210-916D-16885FE1B605}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{39A7D80C-9DEE-4E34-AC4B-768CD4D2D77F} = {322607EA-0DEC-45D2-BFA4-A6AE2276DEE0}
+		{81E7CBE3-9763-4935-94D4-512480A85C46} = {322607EA-0DEC-45D2-BFA4-A6AE2276DEE0}
+		{95B7A616-C472-47CA-BC91-E88FB763A78B} = {322607EA-0DEC-45D2-BFA4-A6AE2276DEE0}
+		{EE434B59-C7F4-479F-8F4B-FC2ACB182CCB} = {D0A9B32B-EF5D-41FC-978C-F64E93D2D595}
+		{424489A3-270A-4AD2-A3C4-4F726BF5D490} = {D0A9B32B-EF5D-41FC-978C-F64E93D2D595}
+		{D2A7F166-96E6-4E0B-89CA-8869866AF10B} = {D0A9B32B-EF5D-41FC-978C-F64E93D2D595}
+		{1A43206C-552E-43F8-ACD3-428DA68046E4} = {D0A9B32B-EF5D-41FC-978C-F64E93D2D595}
+		{AA422FF6-101E-4203-955D-833F14CD54ED} = {D0A9B32B-EF5D-41FC-978C-F64E93D2D595}
+		{C841EE65-4F8E-4779-987C-7E64BACFAC59} = {27293BE9-162F-4210-916D-16885FE1B605}
+		{1C28E125-BC75-4E11-B69A-0E56BD615C57} = {27293BE9-162F-4210-916D-16885FE1B605}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7922FA3-306A-41B9-B8DC-CC4DBE685A85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F24D3391-2928-4E83-AADE-B34423498750}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F24D3391-2928-4E83-AADE-B34423498750}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA11A15E-C713-4194-8A7D-C4949F769EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA11A15E-C713-4194-8A7D-C4949F769EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA11A15E-C713-4194-8A7D-C4949F769EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA11A15E-C713-4194-8A7D-C4949F769EF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39A7D80C-9DEE-4E34-AC4B-768CD4D2D77F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39A7D80C-9DEE-4E34-AC4B-768CD4D2D77F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39A7D80C-9DEE-4E34-AC4B-768CD4D2D77F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39A7D80C-9DEE-4E34-AC4B-768CD4D2D77F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE434B59-C7F4-479F-8F4B-FC2ACB182CCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE434B59-C7F4-479F-8F4B-FC2ACB182CCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE434B59-C7F4-479F-8F4B-FC2ACB182CCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE434B59-C7F4-479F-8F4B-FC2ACB182CCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{424489A3-270A-4AD2-A3C4-4F726BF5D490}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{424489A3-270A-4AD2-A3C4-4F726BF5D490}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{424489A3-270A-4AD2-A3C4-4F726BF5D490}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{424489A3-270A-4AD2-A3C4-4F726BF5D490}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C841EE65-4F8E-4779-987C-7E64BACFAC59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C841EE65-4F8E-4779-987C-7E64BACFAC59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C841EE65-4F8E-4779-987C-7E64BACFAC59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C841EE65-4F8E-4779-987C-7E64BACFAC59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81E7CBE3-9763-4935-94D4-512480A85C46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81E7CBE3-9763-4935-94D4-512480A85C46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81E7CBE3-9763-4935-94D4-512480A85C46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81E7CBE3-9763-4935-94D4-512480A85C46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95B7A616-C472-47CA-BC91-E88FB763A78B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95B7A616-C472-47CA-BC91-E88FB763A78B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95B7A616-C472-47CA-BC91-E88FB763A78B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95B7A616-C472-47CA-BC91-E88FB763A78B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2A7F166-96E6-4E0B-89CA-8869866AF10B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C28E125-BC75-4E11-B69A-0E56BD615C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C28E125-BC75-4E11-B69A-0E56BD615C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C28E125-BC75-4E11-B69A-0E56BD615C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C28E125-BC75-4E11-B69A-0E56BD615C57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A43206C-552E-43F8-ACD3-428DA68046E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A43206C-552E-43F8-ACD3-428DA68046E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A43206C-552E-43F8-ACD3-428DA68046E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A43206C-552E-43F8-ACD3-428DA68046E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA422FF6-101E-4203-955D-833F14CD54ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA422FF6-101E-4203-955D-833F14CD54ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA422FF6-101E-4203-955D-833F14CD54ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA422FF6-101E-4203-955D-833F14CD54ED}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A7922FA3-306A-41B9-B8DC-CC4DBE685A85} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F24D3391-2928-4E83-AADE-B34423498750} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{3DF9A5D5-3D4B-4378-9B55-CFA6AC0114D9} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{EA11A15E-C713-4194-8A7D-C4949F769EF8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7779716F-2D3C-47B6-9C48-009BD2F70523}
+		SolutionGuid = {6C0E44F7-3944-4BCA-94DA-2E558CEA1FE8}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
index 23ce3b6178d8b2..b2c50400951138 100644
--- a/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
+++ b/src/libraries/System.Diagnostics.EventLog/System.Diagnostics.EventLog.sln
@@ -1,60 +1,163 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog.Tests", "tests\System.Diagnostics.EventLog.Tests.csproj", "{5B218883-369E-4C3D-8BD0-74843474DCBD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{432779B9-3CBD-4871-A7DC-D8A192319DBD} = {432779B9-3CBD-4871-A7DC-D8A192319DBD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{71D520C0-6305-4599-B564-584C6E9FEAEC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "src\System.Diagnostics.EventLog.csproj", "{432779B9-3CBD-4871-A7DC-D8A192319DBD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F405C42E-EF6F-4404-80FD-3B87E216707C} = {F405C42E-EF6F-4404-80FD-3B87E216707C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{827D9EF0-C028-4984-A02F-1D437DA2F050}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "ref\System.Diagnostics.EventLog.csproj", "{F405C42E-EF6F-4404-80FD-3B87E216707C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{144F8495-9FFF-47EB-A44D-F242268FB7C1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "ref\System.Diagnostics.EventLog.csproj", "{635F5794-A69E-489D-9D1F-1D20D3DDE740}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "src\System.Diagnostics.EventLog.csproj", "{5BB72C32-4B04-415E-A504-F41F2FE0E54D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog.Tests", "tests\System.Diagnostics.EventLog.Tests.csproj", "{DE282697-BDF2-4FC7-B34C-911F35AE47D6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3EC81942-75A3-4D56-A63C-2221337A0BB2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{EF2BA909-F545-45B6-A467-24CCB98E8370}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{FC4255EC-719E-44AA-A1E3-CF76329C3052}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{15C7E4A3-8607-4D54-871E-8400C2471720}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{96BF2393-E065-4F51-8CDF-2D767A39C301}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{4C97A55D-7FD2-4336-9731-F7DC6CD73FD4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{A4459089-205A-4656-B4C8-75509380B6F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{673B2D1D-A19E-4866-A95B-F9F458C07581}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{AF841B09-C343-46ED-B3DB-0EF1E3F55BF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F937C02F-0525-4357-B4DA-364A78C1408B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{B5F56812-AFB4-4B7B-9E98-A5FDBBAC821B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{5A65AC14-FB2F-489B-9B45-13086A65999D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{6D90E38F-7633-4BB0-8D67-7397CE99B981}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{5CA038BA-A513-446F-9E5A-BE6E95802D58}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{187339DE-D2FE-4E20-B207-49ECE285B345}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B94A0C26-D918-4D03-BA6B-B34282EFDF94}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{71D520C0-6305-4599-B564-584C6E9FEAEC} = {187339DE-D2FE-4E20-B207-49ECE285B345}
+		{DE282697-BDF2-4FC7-B34C-911F35AE47D6} = {187339DE-D2FE-4E20-B207-49ECE285B345}
+		{827D9EF0-C028-4984-A02F-1D437DA2F050} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{635F5794-A69E-489D-9D1F-1D20D3DDE740} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{EF2BA909-F545-45B6-A467-24CCB98E8370} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{FC4255EC-719E-44AA-A1E3-CF76329C3052} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{4C97A55D-7FD2-4336-9731-F7DC6CD73FD4} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{673B2D1D-A19E-4866-A95B-F9F458C07581} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{F937C02F-0525-4357-B4DA-364A78C1408B} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{6D90E38F-7633-4BB0-8D67-7397CE99B981} = {88ACF2B5-1FAC-456E-9E52-AFB708F44F7C}
+		{144F8495-9FFF-47EB-A44D-F242268FB7C1} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{5BB72C32-4B04-415E-A504-F41F2FE0E54D} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{15C7E4A3-8607-4D54-871E-8400C2471720} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{96BF2393-E065-4F51-8CDF-2D767A39C301} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{A4459089-205A-4656-B4C8-75509380B6F1} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{AF841B09-C343-46ED-B3DB-0EF1E3F55BF2} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{B5F56812-AFB4-4B7B-9E98-A5FDBBAC821B} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{5A65AC14-FB2F-489B-9B45-13086A65999D} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+		{5CA038BA-A513-446F-9E5A-BE6E95802D58} = {B94A0C26-D918-4D03-BA6B-B34282EFDF94}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5B218883-369E-4C3D-8BD0-74843474DCBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B218883-369E-4C3D-8BD0-74843474DCBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B218883-369E-4C3D-8BD0-74843474DCBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B218883-369E-4C3D-8BD0-74843474DCBD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{432779B9-3CBD-4871-A7DC-D8A192319DBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{432779B9-3CBD-4871-A7DC-D8A192319DBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{432779B9-3CBD-4871-A7DC-D8A192319DBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{432779B9-3CBD-4871-A7DC-D8A192319DBD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F405C42E-EF6F-4404-80FD-3B87E216707C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F405C42E-EF6F-4404-80FD-3B87E216707C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F405C42E-EF6F-4404-80FD-3B87E216707C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F405C42E-EF6F-4404-80FD-3B87E216707C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3EC81942-75A3-4D56-A63C-2221337A0BB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3EC81942-75A3-4D56-A63C-2221337A0BB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3EC81942-75A3-4D56-A63C-2221337A0BB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3EC81942-75A3-4D56-A63C-2221337A0BB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71D520C0-6305-4599-B564-584C6E9FEAEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71D520C0-6305-4599-B564-584C6E9FEAEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71D520C0-6305-4599-B564-584C6E9FEAEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71D520C0-6305-4599-B564-584C6E9FEAEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{827D9EF0-C028-4984-A02F-1D437DA2F050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{827D9EF0-C028-4984-A02F-1D437DA2F050}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{827D9EF0-C028-4984-A02F-1D437DA2F050}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{827D9EF0-C028-4984-A02F-1D437DA2F050}.Release|Any CPU.Build.0 = Release|Any CPU
+		{144F8495-9FFF-47EB-A44D-F242268FB7C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{144F8495-9FFF-47EB-A44D-F242268FB7C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{144F8495-9FFF-47EB-A44D-F242268FB7C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{144F8495-9FFF-47EB-A44D-F242268FB7C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{635F5794-A69E-489D-9D1F-1D20D3DDE740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{635F5794-A69E-489D-9D1F-1D20D3DDE740}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{635F5794-A69E-489D-9D1F-1D20D3DDE740}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{635F5794-A69E-489D-9D1F-1D20D3DDE740}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BB72C32-4B04-415E-A504-F41F2FE0E54D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BB72C32-4B04-415E-A504-F41F2FE0E54D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BB72C32-4B04-415E-A504-F41F2FE0E54D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BB72C32-4B04-415E-A504-F41F2FE0E54D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE282697-BDF2-4FC7-B34C-911F35AE47D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE282697-BDF2-4FC7-B34C-911F35AE47D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE282697-BDF2-4FC7-B34C-911F35AE47D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE282697-BDF2-4FC7-B34C-911F35AE47D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF2BA909-F545-45B6-A467-24CCB98E8370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF2BA909-F545-45B6-A467-24CCB98E8370}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF2BA909-F545-45B6-A467-24CCB98E8370}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF2BA909-F545-45B6-A467-24CCB98E8370}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC4255EC-719E-44AA-A1E3-CF76329C3052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC4255EC-719E-44AA-A1E3-CF76329C3052}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC4255EC-719E-44AA-A1E3-CF76329C3052}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC4255EC-719E-44AA-A1E3-CF76329C3052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15C7E4A3-8607-4D54-871E-8400C2471720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15C7E4A3-8607-4D54-871E-8400C2471720}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15C7E4A3-8607-4D54-871E-8400C2471720}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15C7E4A3-8607-4D54-871E-8400C2471720}.Release|Any CPU.Build.0 = Release|Any CPU
+		{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{010F66ED-FE0D-49B2-A708-0C9ADF6D08F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96BF2393-E065-4F51-8CDF-2D767A39C301}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96BF2393-E065-4F51-8CDF-2D767A39C301}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96BF2393-E065-4F51-8CDF-2D767A39C301}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96BF2393-E065-4F51-8CDF-2D767A39C301}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C97A55D-7FD2-4336-9731-F7DC6CD73FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C97A55D-7FD2-4336-9731-F7DC6CD73FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C97A55D-7FD2-4336-9731-F7DC6CD73FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C97A55D-7FD2-4336-9731-F7DC6CD73FD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4459089-205A-4656-B4C8-75509380B6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4459089-205A-4656-B4C8-75509380B6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4459089-205A-4656-B4C8-75509380B6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4459089-205A-4656-B4C8-75509380B6F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{673B2D1D-A19E-4866-A95B-F9F458C07581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{673B2D1D-A19E-4866-A95B-F9F458C07581}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{673B2D1D-A19E-4866-A95B-F9F458C07581}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{673B2D1D-A19E-4866-A95B-F9F458C07581}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF841B09-C343-46ED-B3DB-0EF1E3F55BF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF841B09-C343-46ED-B3DB-0EF1E3F55BF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF841B09-C343-46ED-B3DB-0EF1E3F55BF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF841B09-C343-46ED-B3DB-0EF1E3F55BF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F937C02F-0525-4357-B4DA-364A78C1408B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F937C02F-0525-4357-B4DA-364A78C1408B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F937C02F-0525-4357-B4DA-364A78C1408B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F937C02F-0525-4357-B4DA-364A78C1408B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5F56812-AFB4-4B7B-9E98-A5FDBBAC821B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5F56812-AFB4-4B7B-9E98-A5FDBBAC821B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5F56812-AFB4-4B7B-9E98-A5FDBBAC821B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5F56812-AFB4-4B7B-9E98-A5FDBBAC821B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A65AC14-FB2F-489B-9B45-13086A65999D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A65AC14-FB2F-489B-9B45-13086A65999D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A65AC14-FB2F-489B-9B45-13086A65999D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A65AC14-FB2F-489B-9B45-13086A65999D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D90E38F-7633-4BB0-8D67-7397CE99B981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D90E38F-7633-4BB0-8D67-7397CE99B981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D90E38F-7633-4BB0-8D67-7397CE99B981}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D90E38F-7633-4BB0-8D67-7397CE99B981}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CA038BA-A513-446F-9E5A-BE6E95802D58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CA038BA-A513-446F-9E5A-BE6E95802D58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CA038BA-A513-446F-9E5A-BE6E95802D58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CA038BA-A513-446F-9E5A-BE6E95802D58}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5B218883-369E-4C3D-8BD0-74843474DCBD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{432779B9-3CBD-4871-A7DC-D8A192319DBD} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F405C42E-EF6F-4404-80FD-3B87E216707C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3EC81942-75A3-4D56-A63C-2221337A0BB2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DFF5A927-E889-4999-B4D2-E15E3B1B8E00}
+		SolutionGuid = {3DB51F1D-40A4-4B5E-85BF-74CCDEE2FAA7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
index c5ef898a0f672b..8a0e757a8e3c79 100644
--- a/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
+++ b/src/libraries/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln
@@ -1,107 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo.Tests", "tests\System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj", "{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D6C0D80D-9454-4965-A580-A43484972632}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeConsoleApp", "tests\NativeConsoleApp\NativeConsoleApp.vcxproj", "{3002560A-5097-4A65-B562-93E335E64163}"
-	ProjectSection(ProjectDependencies) = postProject
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{C6B1F2EE-B94C-4A08-8BC4-FCC8B3176057}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NativeLibrary", "tests\NativeLibrary\NativeLibrary.vcxproj", "{32C9BB6C-46F4-43D8-B89E-3A1AFA70F38B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo", "ref\System.Diagnostics.FileVersionInfo.csproj", "{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecondNativeLibrary", "tests\SecondNativeLibrary\SecondNativeLibrary.vcxproj", "{925D347C-697C-4777-8995-62426C6866F2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo", "src\System.Diagnostics.FileVersionInfo.csproj", "{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "tests\System.Diagnostics.FileVersionInfo.TestAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {00EDA5FD-E802-40D3-92D5-56C27612D36D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "tests\System.Diagnostics.FileVersionInfo.TestAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo", "src\System.Diagnostics.FileVersionInfo.csproj", "{00EDA5FD-E802-40D3-92D5-56C27612D36D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F815A563-B6B8-49F3-9E90-1A134033B864} = {F815A563-B6B8-49F3-9E90-1A134033B864}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo.Tests", "tests\System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj", "{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.FileVersionInfo", "ref\System.Diagnostics.FileVersionInfo.csproj", "{F815A563-B6B8-49F3-9E90-1A134033B864}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E75BB739-AE88-4CAA-82CA-72224A39D8CE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2391C35B-E06E-4BD8-ABF0-C7EE981336D1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F7423C03-D55C-4201-B13A-1748A8EAD2D5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B5DAC357-D179-48F5-A830-659A40966E9B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9624A23D-A470-496B-BEEA-D1E7DCE8BFA3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8E0E605D-B5D4-408F-A3E7-DB1EA2D8E25C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{A1132F6D-4D68-4E23-B35C-FDBE12C04D99}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B5999763-DE3D-4966-B95B-3BB6A72033B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{44D25ADC-F3EF-4C40-A66D-0CB45F0FD2A3}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D6C0D80D-9454-4965-A580-A43484972632} = {8E0E605D-B5D4-408F-A3E7-DB1EA2D8E25C}
+		{0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F} = {8E0E605D-B5D4-408F-A3E7-DB1EA2D8E25C}
+		{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49} = {8E0E605D-B5D4-408F-A3E7-DB1EA2D8E25C}
+		{C6B1F2EE-B94C-4A08-8BC4-FCC8B3176057} = {B5999763-DE3D-4966-B95B-3BB6A72033B6}
+		{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6} = {B5999763-DE3D-4966-B95B-3BB6A72033B6}
+		{E75BB739-AE88-4CAA-82CA-72224A39D8CE} = {B5999763-DE3D-4966-B95B-3BB6A72033B6}
+		{F7423C03-D55C-4201-B13A-1748A8EAD2D5} = {B5999763-DE3D-4966-B95B-3BB6A72033B6}
+		{B5DAC357-D179-48F5-A830-659A40966E9B} = {B5999763-DE3D-4966-B95B-3BB6A72033B6}
+		{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2} = {44D25ADC-F3EF-4C40-A66D-0CB45F0FD2A3}
+		{2391C35B-E06E-4BD8-ABF0-C7EE981336D1} = {44D25ADC-F3EF-4C40-A66D-0CB45F0FD2A3}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3002560A-5097-4A65-B562-93E335E64163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3002560A-5097-4A65-B562-93E335E64163}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3002560A-5097-4A65-B562-93E335E64163}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3002560A-5097-4A65-B562-93E335E64163}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32C9BB6C-46F4-43D8-B89E-3A1AFA70F38B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32C9BB6C-46F4-43D8-B89E-3A1AFA70F38B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32C9BB6C-46F4-43D8-B89E-3A1AFA70F38B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32C9BB6C-46F4-43D8-B89E-3A1AFA70F38B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{925D347C-697C-4777-8995-62426C6866F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{925D347C-697C-4777-8995-62426C6866F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{925D347C-697C-4777-8995-62426C6866F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{925D347C-697C-4777-8995-62426C6866F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F815A563-B6B8-49F3-9E90-1A134033B864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F815A563-B6B8-49F3-9E90-1A134033B864}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F815A563-B6B8-49F3-9E90-1A134033B864}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F815A563-B6B8-49F3-9E90-1A134033B864}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9624A23D-A470-496B-BEEA-D1E7DCE8BFA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9624A23D-A470-496B-BEEA-D1E7DCE8BFA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9624A23D-A470-496B-BEEA-D1E7DCE8BFA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9624A23D-A470-496B-BEEA-D1E7DCE8BFA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1132F6D-4D68-4E23-B35C-FDBE12C04D99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1132F6D-4D68-4E23-B35C-FDBE12C04D99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1132F6D-4D68-4E23-B35C-FDBE12C04D99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1132F6D-4D68-4E23-B35C-FDBE12C04D99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6C0D80D-9454-4965-A580-A43484972632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6C0D80D-9454-4965-A580-A43484972632}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6C0D80D-9454-4965-A580-A43484972632}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6C0D80D-9454-4965-A580-A43484972632}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6B1F2EE-B94C-4A08-8BC4-FCC8B3176057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6B1F2EE-B94C-4A08-8BC4-FCC8B3176057}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6B1F2EE-B94C-4A08-8BC4-FCC8B3176057}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6B1F2EE-B94C-4A08-8BC4-FCC8B3176057}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46E9AC6C-347E-4F94-80CB-E1857EC0C5C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{922C96F5-9F92-4F0E-A83D-D1BCDDD187F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B3AFB8E-37F9-4FF7-A5A1-1DABD484231F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F5C48C2-CE74-49FD-BA41-25FCBCE53A49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E75BB739-AE88-4CAA-82CA-72224A39D8CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2391C35B-E06E-4BD8-ABF0-C7EE981336D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7423C03-D55C-4201-B13A-1748A8EAD2D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7423C03-D55C-4201-B13A-1748A8EAD2D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7423C03-D55C-4201-B13A-1748A8EAD2D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7423C03-D55C-4201-B13A-1748A8EAD2D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5DAC357-D179-48F5-A830-659A40966E9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5DAC357-D179-48F5-A830-659A40966E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5DAC357-D179-48F5-A830-659A40966E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5DAC357-D179-48F5-A830-659A40966E9B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6DFDB760-CC88-48AE-BD81-C64844EA3CBC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3002560A-5097-4A65-B562-93E335E64163} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{32C9BB6C-46F4-43D8-B89E-3A1AFA70F38B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{925D347C-697C-4777-8995-62426C6866F2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{28EB14BE-3BC9-4543-ABA6-A932424DFBD0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{00EDA5FD-E802-40D3-92D5-56C27612D36D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F815A563-B6B8-49F3-9E90-1A134033B864} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9624A23D-A470-496B-BEEA-D1E7DCE8BFA3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A1132F6D-4D68-4E23-B35C-FDBE12C04D99} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A1E658C8-446E-42A1-BD77-7FD02C2CD549}
+		SolutionGuid = {9FDF2FF3-5DFC-45E8-9959-B59FF906E689}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
index 4b178e15760c78..5ba935e36b1d4a 100644
--- a/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
+++ b/src/libraries/System.Diagnostics.PerformanceCounter/System.Diagnostics.PerformanceCounter.sln
@@ -1,60 +1,184 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter.Tests", "tests\System.Diagnostics.PerformanceCounter.Tests.csproj", "{296074B7-1CC9-497E-8C1E-FC5C985C75C6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA} = {9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{20B92E8C-E720-4B5A-8647-97CC1BD71E84}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "src\System.Diagnostics.PerformanceCounter.csproj", "{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5BDC8641-E3EE-47B5-BE7B-2D2275402412} = {5BDC8641-E3EE-47B5-BE7B-2D2275402412}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{C0E91259-74A8-48EE-B605-107477516731}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "ref\System.Diagnostics.PerformanceCounter.csproj", "{5BDC8641-E3EE-47B5-BE7B-2D2275402412}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{BE15582B-9584-4471-9BB4-8A30EC31B9C8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{067570A0-D55A-4ECC-A478-B1CBC676E9F3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{96328529-3EB5-4BA4-9998-CB85E279E7F2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "ref\System.Diagnostics.PerformanceCounter.csproj", "{D0C681EE-D578-4CD6-AA62-33874FCE3E37}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{69B86C3B-8C7E-4B19-ADF9-931B1C17E7AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter", "src\System.Diagnostics.PerformanceCounter.csproj", "{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.PerformanceCounter.Tests", "tests\System.Diagnostics.PerformanceCounter.Tests.csproj", "{EB8EF358-4028-4272-B71E-523F8D0A73F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{F237AE76-582E-45B8-AC46-B0CE8C65780B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{C96B536F-198D-460B-95CE-2B2A9B7B8A92}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{D9D0B99B-E571-44C2-9C78-60FB81E177BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{765847B4-A28D-41F2-A45F-BC0098E3147E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{94DCEBA5-2ADA-4F1E-9573-8A2904FFCBD1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{36353FFE-4248-4502-BF12-7AF63436FA08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{43214093-FA08-4699-A62B-D7BC858BAC78}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{F8480484-A2CA-4215-AC4B-82F6149FEC02}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{016A2867-5988-47FA-A811-C570BA193FCA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{1FBBD54B-1D47-4B9F-90D5-F0EAF577CEB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{97932D09-4DF9-4836-ADEF-C52DBC0661CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A83CA9C-4975-47B7-BD00-BA758D5D7BE2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0B9F466C-9D1A-4515-B60D-39D75C27DDA6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84} = {1A83CA9C-4975-47B7-BD00-BA758D5D7BE2}
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0} = {1A83CA9C-4975-47B7-BD00-BA758D5D7BE2}
+		{C0E91259-74A8-48EE-B605-107477516731} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{F237AE76-582E-45B8-AC46-B0CE8C65780B} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{C96B536F-198D-460B-95CE-2B2A9B7B8A92} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{765847B4-A28D-41F2-A45F-BC0098E3147E} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{94DCEBA5-2ADA-4F1E-9573-8A2904FFCBD1} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{016A2867-5988-47FA-A811-C570BA193FCA} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD} = {0B9F466C-9D1A-4515-B60D-39D75C27DDA6}
+		{BE15582B-9584-4471-9BB4-8A30EC31B9C8} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{D9D0B99B-E571-44C2-9C78-60FB81E177BB} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{36353FFE-4248-4502-BF12-7AF63436FA08} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{43214093-FA08-4699-A62B-D7BC858BAC78} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{1FBBD54B-1D47-4B9F-90D5-F0EAF577CEB3} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7} = {E51E7F90-8CFC-41C5-B3C6-4320EB5C164D}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{296074B7-1CC9-497E-8C1E-FC5C985C75C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BDC8641-E3EE-47B5-BE7B-2D2275402412}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69B86C3B-8C7E-4B19-ADF9-931B1C17E7AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69B86C3B-8C7E-4B19-ADF9-931B1C17E7AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69B86C3B-8C7E-4B19-ADF9-931B1C17E7AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69B86C3B-8C7E-4B19-ADF9-931B1C17E7AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20B92E8C-E720-4B5A-8647-97CC1BD71E84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0E91259-74A8-48EE-B605-107477516731}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0E91259-74A8-48EE-B605-107477516731}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0E91259-74A8-48EE-B605-107477516731}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0E91259-74A8-48EE-B605-107477516731}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE15582B-9584-4471-9BB4-8A30EC31B9C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE15582B-9584-4471-9BB4-8A30EC31B9C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE15582B-9584-4471-9BB4-8A30EC31B9C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE15582B-9584-4471-9BB4-8A30EC31B9C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{067570A0-D55A-4ECC-A478-B1CBC676E9F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96328529-3EB5-4BA4-9998-CB85E279E7F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0C681EE-D578-4CD6-AA62-33874FCE3E37}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B7C465F-44E2-4D0B-9A9F-30F20FA49A16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB8EF358-4028-4272-B71E-523F8D0A73F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F237AE76-582E-45B8-AC46-B0CE8C65780B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C96B536F-198D-460B-95CE-2B2A9B7B8A92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C96B536F-198D-460B-95CE-2B2A9B7B8A92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C96B536F-198D-460B-95CE-2B2A9B7B8A92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C96B536F-198D-460B-95CE-2B2A9B7B8A92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9D0B99B-E571-44C2-9C78-60FB81E177BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9D0B99B-E571-44C2-9C78-60FB81E177BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9D0B99B-E571-44C2-9C78-60FB81E177BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9D0B99B-E571-44C2-9C78-60FB81E177BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{765847B4-A28D-41F2-A45F-BC0098E3147E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{765847B4-A28D-41F2-A45F-BC0098E3147E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{765847B4-A28D-41F2-A45F-BC0098E3147E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{765847B4-A28D-41F2-A45F-BC0098E3147E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7465FB7-25E1-4822-BB4C-F9BFBE94BAD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94DCEBA5-2ADA-4F1E-9573-8A2904FFCBD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94DCEBA5-2ADA-4F1E-9573-8A2904FFCBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94DCEBA5-2ADA-4F1E-9573-8A2904FFCBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94DCEBA5-2ADA-4F1E-9573-8A2904FFCBD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36353FFE-4248-4502-BF12-7AF63436FA08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36353FFE-4248-4502-BF12-7AF63436FA08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36353FFE-4248-4502-BF12-7AF63436FA08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36353FFE-4248-4502-BF12-7AF63436FA08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C707BFF-6BA9-4EB8-BC75-5341391B5FC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43214093-FA08-4699-A62B-D7BC858BAC78}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8480484-A2CA-4215-AC4B-82F6149FEC02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E0AB255-7FD0-4DE0-9675-59DE81B12E54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{016A2867-5988-47FA-A811-C570BA193FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{016A2867-5988-47FA-A811-C570BA193FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{016A2867-5988-47FA-A811-C570BA193FCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{016A2867-5988-47FA-A811-C570BA193FCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FBBD54B-1D47-4B9F-90D5-F0EAF577CEB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FBBD54B-1D47-4B9F-90D5-F0EAF577CEB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FBBD54B-1D47-4B9F-90D5-F0EAF577CEB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FBBD54B-1D47-4B9F-90D5-F0EAF577CEB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97932D09-4DF9-4836-ADEF-C52DBC0661CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60DB3C65-9EDA-45AA-85E6-37F1375CF1E7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{296074B7-1CC9-497E-8C1E-FC5C985C75C6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{9758106C-5D4E-475D-B5E7-B7ABC46B1DDA} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{5BDC8641-E3EE-47B5-BE7B-2D2275402412} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{69B86C3B-8C7E-4B19-ADF9-931B1C17E7AC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E55827A2-8680-4A49-858D-70A4E41D2B9F}
+		SolutionGuid = {51062B21-546F-4B2A-A2B8-77ABF1079C06}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
index cc855fb6349e5e..f10207e2e9510c 100644
--- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
+++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln
@@ -1,60 +1,170 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process.Tests", "tests\System.Diagnostics.Process.Tests.csproj", "{E1114510-844C-4BB2-BBAD-8595BD16E24B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F55047F8-E47B-46E3-B221-C23595AFE168} = {F55047F8-E47B-46E3-B221-C23595AFE168}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process", "src\System.Diagnostics.Process.csproj", "{F55047F8-E47B-46E3-B221-C23595AFE168}"
-	ProjectSection(ProjectDependencies) = postProject
-		{98B33275-39D8-4997-867D-04C69C69885E} = {98B33275-39D8-4997-867D-04C69C69885E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{AA583AE2-BE26-4AA4-845F-916133916B7D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process", "ref\System.Diagnostics.Process.csproj", "{98B33275-39D8-4997-867D-04C69C69885E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process", "ref\System.Diagnostics.Process.csproj", "{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process", "src\System.Diagnostics.Process.csproj", "{314810DF-262E-490E-8F05-F31695C31F0C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process.Tests", "tests\System.Diagnostics.Process.Tests.csproj", "{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C1978154-3C91-4097-BEC4-027BDCF986B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{84075D59-9D5E-40F7-A914-911087419FE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{6155E80C-6CE0-4A93-8BDF-80494E489BB1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{F58E8664-9E68-48FF-BDCB-674CECF2FF1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{539D79BC-7E66-44B5-B072-30B068404822}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2E775DDC-C58B-4EBA-BE62-9B08D7C48059}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{56677D77-0E77-42CD-A9DB-8493995E989F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{A0DE3634-6C95-4AA2-AFD5-733D352B6756}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{97763BA2-BD91-480C-8173-65EA2A72EAA8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{8B941B7A-8EA3-4DB3-BBE4-27B12ECBC00F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{05C87914-711A-4589-9672-8169DB6A6BA4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9ABDFB23-5430-4410-81C3-3C0327996580}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9E2660FE-F883-4701-8AF9-AB56F848B884}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A} = {05C87914-711A-4589-9672-8169DB6A6BA4}
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D} = {05C87914-711A-4589-9672-8169DB6A6BA4}
+		{AA583AE2-BE26-4AA4-845F-916133916B7D} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{6155E80C-6CE0-4A93-8BDF-80494E489BB1} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{F58E8664-9E68-48FF-BDCB-674CECF2FF1D} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{2E775DDC-C58B-4EBA-BE62-9B08D7C48059} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{56677D77-0E77-42CD-A9DB-8493995E989F} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{8B941B7A-8EA3-4DB3-BBE4-27B12ECBC00F} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F} = {9ABDFB23-5430-4410-81C3-3C0327996580}
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{314810DF-262E-490E-8F05-F31695C31F0C} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{84075D59-9D5E-40F7-A914-911087419FE4} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{539D79BC-7E66-44B5-B072-30B068404822} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{A0DE3634-6C95-4AA2-AFD5-733D352B6756} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7} = {9E2660FE-F883-4701-8AF9-AB56F848B884}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1114510-844C-4BB2-BBAD-8595BD16E24B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1114510-844C-4BB2-BBAD-8595BD16E24B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F55047F8-E47B-46E3-B221-C23595AFE168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F55047F8-E47B-46E3-B221-C23595AFE168}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F55047F8-E47B-46E3-B221-C23595AFE168}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F55047F8-E47B-46E3-B221-C23595AFE168}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98B33275-39D8-4997-867D-04C69C69885E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98B33275-39D8-4997-867D-04C69C69885E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98B33275-39D8-4997-867D-04C69C69885E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98B33275-39D8-4997-867D-04C69C69885E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C1978154-3C91-4097-BEC4-027BDCF986B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C1978154-3C91-4097-BEC4-027BDCF986B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C1978154-3C91-4097-BEC4-027BDCF986B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C1978154-3C91-4097-BEC4-027BDCF986B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3742D5F8-5C86-49FD-BAEA-050742CCEB7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA583AE2-BE26-4AA4-845F-916133916B7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA583AE2-BE26-4AA4-845F-916133916B7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA583AE2-BE26-4AA4-845F-916133916B7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA583AE2-BE26-4AA4-845F-916133916B7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5AE4EB3-DB23-4F33-858B-63B68A60F7F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4792FFA1-1AD2-4230-8DE3-D2BCF1CF804F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{314810DF-262E-490E-8F05-F31695C31F0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABA61FEF-EB06-441D-9D3D-F25FFC7CD83D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F485B36D-8DDB-44EE-A993-2FCAEC81BE3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84075D59-9D5E-40F7-A914-911087419FE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6155E80C-6CE0-4A93-8BDF-80494E489BB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F58E8664-9E68-48FF-BDCB-674CECF2FF1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F58E8664-9E68-48FF-BDCB-674CECF2FF1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F58E8664-9E68-48FF-BDCB-674CECF2FF1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F58E8664-9E68-48FF-BDCB-674CECF2FF1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{539D79BC-7E66-44B5-B072-30B068404822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{539D79BC-7E66-44B5-B072-30B068404822}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{539D79BC-7E66-44B5-B072-30B068404822}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{539D79BC-7E66-44B5-B072-30B068404822}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E775DDC-C58B-4EBA-BE62-9B08D7C48059}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3BF99E45-BBB6-47B5-A3F3-B7844A9E7D5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56677D77-0E77-42CD-A9DB-8493995E989F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56677D77-0E77-42CD-A9DB-8493995E989F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56677D77-0E77-42CD-A9DB-8493995E989F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56677D77-0E77-42CD-A9DB-8493995E989F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0DE3634-6C95-4AA2-AFD5-733D352B6756}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97763BA2-BD91-480C-8173-65EA2A72EAA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8F3933C-7C0D-41B3-8B1F-D507EF92156B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B941B7A-8EA3-4DB3-BBE4-27B12ECBC00F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B941B7A-8EA3-4DB3-BBE4-27B12ECBC00F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B941B7A-8EA3-4DB3-BBE4-27B12ECBC00F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B941B7A-8EA3-4DB3-BBE4-27B12ECBC00F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CB8C6A4-3D21-47F6-A9A3-A9D1DA3E6B9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{546D7B53-3A00-47A4-BBE0-F4BA12126D6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C521ED1-5221-4C93-BBA0-86C13D4C23C7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E1114510-844C-4BB2-BBAD-8595BD16E24B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F55047F8-E47B-46E3-B221-C23595AFE168} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{98B33275-39D8-4997-867D-04C69C69885E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C1978154-3C91-4097-BEC4-027BDCF986B2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {80AB55A3-9829-474C-B17D-CC239ECC04CE}
+		SolutionGuid = {B723DDA5-3A21-4A9C-A344-548BE6D05B72}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
index 666faf8fa7ee57..064c4f1110284e 100644
--- a/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
+++ b/src/libraries/System.Diagnostics.StackTrace/System.Diagnostics.StackTrace.sln
@@ -1,102 +1,375 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.StackTrace.Tests", "tests\System.Diagnostics.StackTrace.Tests.csproj", "{297A9116-1005-499D-A895-2063D03E4C94}"
-	ProjectSection(ProjectDependencies) = postProject
-		{02304469-722E-4723-92A1-820B9A37D275} = {02304469-722E-4723-92A1-820B9A37D275}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E34F351F-8EB7-4D44-BA44-85F791F662CC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.StackTrace", "src\System.Diagnostics.StackTrace.csproj", "{02304469-722E-4723-92A1-820B9A37D275}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C38217EF-88F4-4D56-9F58-780BE1DDAFF6} = {C38217EF-88F4-4D56-9F58-780BE1DDAFF6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{65FFFD20-CE5D-4FC0-A525-1C308186A16F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.StackTrace", "ref\System.Diagnostics.StackTrace.csproj", "{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4BE25797-A2B8-4208-B191-C78C7E127150}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj", "{26367C54-C1A4-462F-AA71-E48644208AE9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{1A44729F-AFB5-4BB0-8348-58833378AE55}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{854C7BBD-8B87-44AE-B109-421647CD5959}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.StackTrace", "ref\System.Diagnostics.StackTrace.csproj", "{A8BB1002-C4B3-4B77-9A99-908FC6C84811}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj", "{ADDF4CDC-9F80-492C-85B5-908E34B64D74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.StackTrace", "src\System.Diagnostics.StackTrace.csproj", "{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem", "..\System.IO.FileSystem\src\System.IO.FileSystem.csproj", "{6E4DEE24-716D-4E97-877B-83B138020091}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.StackTrace.Tests", "tests\System.Diagnostics.StackTrace.Tests.csproj", "{956E53A2-5A41-44A7-900A-49044376B2BD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{20636DC7-EB9C-4E40-B10C-BC023B4AEEDF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "..\System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj", "{96501106-36D0-4093-8FEE-AF90713D09ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{5D5B7D66-AEB4-41A1-AB8A-1AB884A65064}"
+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\src\System.Reflection.Metadata.csproj", "{456DBDB3-EF0D-4517-8893-8D5087CA3254}"
+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.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{085360DE-8FF9-4725-8014-3C660BB36A25}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{623D46A5-8ED4-43CF-A01B-528F0A505090}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E98C1B4A-F81B-4175-BB49-09084A619C9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{896EF7E4-D13F-429F-A69C-C52A3FA5B099}"
+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}") = "src", "src", "{3D631FAC-8298-4D64-9955-94A7708FFE7D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C3ED1FA4-1540-4E02-B3CD-994049663AFD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A207BC1D-9996-43E8-B034-029B67CE2BCD}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{26367C54-C1A4-462F-AA71-E48644208AE9} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{1A44729F-AFB5-4BB0-8348-58833378AE55} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{96501106-36D0-4093-8FEE-AF90713D09ED} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{623D46A5-8ED4-43CF-A01B-528F0A505090} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{039BB256-1BCF-4398-B586-C05F7C5225C4} = {3D631FAC-8298-4D64-9955-94A7708FFE7D}
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F} = {C3ED1FA4-1540-4E02-B3CD-994049663AFD}
+		{956E53A2-5A41-44A7-900A-49044376B2BD} = {C3ED1FA4-1540-4E02-B3CD-994049663AFD}
+		{4BE25797-A2B8-4208-B191-C78C7E127150} = {A207BC1D-9996-43E8-B034-029B67CE2BCD}
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811} = {A207BC1D-9996-43E8-B034-029B67CE2BCD}
+		{DDB26596-113C-471A-91B0-9609C743ACA1} = {A207BC1D-9996-43E8-B034-029B67CE2BCD}
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B} = {A207BC1D-9996-43E8-B034-029B67CE2BCD}
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099} = {A207BC1D-9996-43E8-B034-029B67CE2BCD}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02304469-722E-4723-92A1-820B9A37D275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02304469-722E-4723-92A1-820B9A37D275}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02304469-722E-4723-92A1-820B9A37D275}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02304469-722E-4723-92A1-820B9A37D275}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C38217EF-88F4-4D56-9F58-780BE1DDAFF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{854C7BBD-8B87-44AE-B109-421647CD5959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{854C7BBD-8B87-44AE-B109-421647CD5959}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{854C7BBD-8B87-44AE-B109-421647CD5959}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{854C7BBD-8B87-44AE-B109-421647CD5959}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADDF4CDC-9F80-492C-85B5-908E34B64D74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADDF4CDC-9F80-492C-85B5-908E34B64D74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADDF4CDC-9F80-492C-85B5-908E34B64D74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADDF4CDC-9F80-492C-85B5-908E34B64D74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E4DEE24-716D-4E97-877B-83B138020091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E4DEE24-716D-4E97-877B-83B138020091}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E4DEE24-716D-4E97-877B-83B138020091}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E4DEE24-716D-4E97-877B-83B138020091}.Release|Any CPU.Build.0 = Release|Any CPU
-		{20636DC7-EB9C-4E40-B10C-BC023B4AEEDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20636DC7-EB9C-4E40-B10C-BC023B4AEEDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20636DC7-EB9C-4E40-B10C-BC023B4AEEDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20636DC7-EB9C-4E40-B10C-BC023B4AEEDF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D5B7D66-AEB4-41A1-AB8A-1AB884A65064}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D5B7D66-AEB4-41A1-AB8A-1AB884A65064}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D5B7D66-AEB4-41A1-AB8A-1AB884A65064}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D5B7D66-AEB4-41A1-AB8A-1AB884A65064}.Release|Any CPU.Build.0 = Release|Any CPU
-		{456DBDB3-EF0D-4517-8893-8D5087CA3254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{456DBDB3-EF0D-4517-8893-8D5087CA3254}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{456DBDB3-EF0D-4517-8893-8D5087CA3254}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{456DBDB3-EF0D-4517-8893-8D5087CA3254}.Release|Any CPU.Build.0 = Release|Any CPU
-		{085360DE-8FF9-4725-8014-3C660BB36A25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{085360DE-8FF9-4725-8014-3C660BB36A25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{085360DE-8FF9-4725-8014-3C660BB36A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{085360DE-8FF9-4725-8014-3C660BB36A25}.Release|Any CPU.Build.0 = Release|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
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Debug|x64.Build.0 = Debug|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Debug|x86.ActiveCfg = Debug|x86
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Debug|x86.Build.0 = Debug|x86
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Release|Any CPU.ActiveCfg = Release|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Release|Any CPU.Build.0 = Release|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Release|x64.ActiveCfg = Release|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Release|x64.Build.0 = Release|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Release|x86.ActiveCfg = Release|x86
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Release|x86.Build.0 = Release|x86
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Checked|Any CPU.Build.0 = Checked|x64
+		{E34F351F-8EB7-4D44-BA44-85F791F662CC}.Checked|x64.ActiveCfg = Checked|x64
+		{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
+		{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
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Debug|x64.Build.0 = Debug|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Debug|x86.Build.0 = Debug|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Release|x64.ActiveCfg = Release|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Release|x64.Build.0 = Release|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Release|x86.ActiveCfg = Release|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Release|x86.Build.0 = Release|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{65FFFD20-CE5D-4FC0-A525-1C308186A16F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Debug|x64.Build.0 = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Debug|x86.Build.0 = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Release|x64.ActiveCfg = Release|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Release|x64.Build.0 = Release|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Release|x86.ActiveCfg = Release|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Release|x86.Build.0 = Release|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4BE25797-A2B8-4208-B191-C78C7E127150}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{26367C54-C1A4-462F-AA71-E48644208AE9}.Checked|x86.ActiveCfg = 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
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Debug|x64.Build.0 = Debug|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Debug|x86.Build.0 = Debug|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Release|x64.ActiveCfg = Release|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Release|x64.Build.0 = Release|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Release|x86.ActiveCfg = Release|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Release|x86.Build.0 = Release|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E3D6317B-BEDD-41D2-A7B4-01A8D050C9C8}.Checked|x86.ActiveCfg = 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
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Debug|x86.Build.0 = Debug|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Release|x64.Build.0 = Release|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Release|x86.Build.0 = Release|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1A44729F-AFB5-4BB0-8348-58833378AE55}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{A8BB1002-C4B3-4B77-9A99-908FC6C84811}.Checked|x86.ActiveCfg = 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
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Debug|x64.Build.0 = Debug|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Debug|x86.Build.0 = Debug|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Release|x64.ActiveCfg = Release|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Release|x64.Build.0 = Release|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Release|x86.ActiveCfg = Release|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Release|x86.Build.0 = Release|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B1632FA3-4F01-4B41-BB61-F7676A25EDA0}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{956E53A2-5A41-44A7-900A-49044376B2BD}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{96501106-36D0-4093-8FEE-AF90713D09ED}.Checked|x86.ActiveCfg = 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
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Release|x64.Build.0 = Release|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Release|x86.Build.0 = Release|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E6DD9860-2824-43D3-BD9D-87ED396B4E46}.Checked|x86.ActiveCfg = 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
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Release|x64.Build.0 = Release|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Release|x86.Build.0 = Release|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5EB0B0B-FFAC-4C1B-AD59-292849F847FE}.Checked|x86.ActiveCfg = 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
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x64.Build.0 = Debug|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Debug|x86.Build.0 = Debug|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x64.ActiveCfg = Release|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x64.Build.0 = Release|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x86.ActiveCfg = Release|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Release|x86.Build.0 = Release|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DDB26596-113C-471A-91B0-9609C743ACA1}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{E5CCAE24-D76A-4409-BED8-A4E3F188A64A}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{449DFAB8-C413-44E4-BEAE-C61595DBCBC2}.Checked|x86.ActiveCfg = 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
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Debug|x64.Build.0 = Debug|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Debug|x86.Build.0 = Debug|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Release|Any CPU.Build.0 = Release|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Release|x64.ActiveCfg = Release|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Release|x64.Build.0 = Release|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Release|x86.ActiveCfg = Release|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Release|x86.Build.0 = Release|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{623D46A5-8ED4-43CF-A01B-528F0A505090}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Release|x64.Build.0 = Release|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Release|x86.Build.0 = Release|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E98C1B4A-F81B-4175-BB49-09084A619C9B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Debug|x64.Build.0 = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Debug|x86.Build.0 = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Release|Any CPU.Build.0 = Release|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Release|x64.ActiveCfg = Release|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Release|x64.Build.0 = Release|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Release|x86.ActiveCfg = Release|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Release|x86.Build.0 = Release|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{896EF7E4-D13F-429F-A69C-C52A3FA5B099}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{039BB256-1BCF-4398-B586-C05F7C5225C4}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{297A9116-1005-499D-A895-2063D03E4C94} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{02304469-722E-4723-92A1-820B9A37D275} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C38217EF-88F4-4D56-9F58-780BE1DDAFF6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{854C7BBD-8B87-44AE-B109-421647CD5959} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{ADDF4CDC-9F80-492C-85B5-908E34B64D74} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{6E4DEE24-716D-4E97-877B-83B138020091} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{20636DC7-EB9C-4E40-B10C-BC023B4AEEDF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{5D5B7D66-AEB4-41A1-AB8A-1AB884A65064} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{456DBDB3-EF0D-4517-8893-8D5087CA3254} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{085360DE-8FF9-4725-8014-3C660BB36A25} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {207AB5D6-FFD0-42E8-88DF-0A3C6DF24251}
+		SolutionGuid = {1572B987-E4D6-45D5-82AB-9CC0BB306C2E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
index efc3612964f4a4..724fc06a80cc12 100644
--- a/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
+++ b/src/libraries/System.Diagnostics.TextWriterTraceListener/System.Diagnostics.TextWriterTraceListener.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener.Tests", "tests\System.Diagnostics.TextWriterTraceListener.Tests.csproj", "{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{315929D9-D76E-47E9-BE82-C787FB3A7876} = {315929D9-D76E-47E9-BE82-C787FB3A7876}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener", "src\System.Diagnostics.TextWriterTraceListener.csproj", "{315929D9-D76E-47E9-BE82-C787FB3A7876}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E10948B-1753-4CD2-ABB7-7A753EEEC023} = {3E10948B-1753-4CD2-ABB7-7A753EEEC023}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{253A9DB7-68EA-4310-A3CA-C7E19450A673}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener", "ref\System.Diagnostics.TextWriterTraceListener.csproj", "{3E10948B-1753-4CD2-ABB7-7A753EEEC023}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener", "ref\System.Diagnostics.TextWriterTraceListener.csproj", "{7B2B6693-9877-47BB-A2A1-C1E94596AAE7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener", "src\System.Diagnostics.TextWriterTraceListener.csproj", "{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TextWriterTraceListener.Tests", "tests\System.Diagnostics.TextWriterTraceListener.Tests.csproj", "{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7742D113-972D-48FD-BCD9-6F98073CBC3E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{203C894D-5FF8-4E4A-9812-2674847CC88D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B325067A-0447-4097-8E76-1430C0440F6B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E098FEF6-66BF-43D3-8A7A-1A4994D3B7C2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9E6066C0-64AD-4F51-B785-DF601C00185C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6609DB9F-AB51-44A7-BCAA-D97114D12B90}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F0793A5A-13FE-4B75-86EA-5F457009CEC6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D} = {9E6066C0-64AD-4F51-B785-DF601C00185C}
+		{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4} = {9E6066C0-64AD-4F51-B785-DF601C00185C}
+		{253A9DB7-68EA-4310-A3CA-C7E19450A673} = {6609DB9F-AB51-44A7-BCAA-D97114D12B90}
+		{7B2B6693-9877-47BB-A2A1-C1E94596AAE7} = {6609DB9F-AB51-44A7-BCAA-D97114D12B90}
+		{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0} = {6609DB9F-AB51-44A7-BCAA-D97114D12B90}
+		{B325067A-0447-4097-8E76-1430C0440F6B} = {6609DB9F-AB51-44A7-BCAA-D97114D12B90}
+		{E098FEF6-66BF-43D3-8A7A-1A4994D3B7C2} = {6609DB9F-AB51-44A7-BCAA-D97114D12B90}
+		{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847} = {F0793A5A-13FE-4B75-86EA-5F457009CEC6}
+		{203C894D-5FF8-4E4A-9812-2674847CC88D} = {F0793A5A-13FE-4B75-86EA-5F457009CEC6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{315929D9-D76E-47E9-BE82-C787FB3A7876}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{315929D9-D76E-47E9-BE82-C787FB3A7876}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{315929D9-D76E-47E9-BE82-C787FB3A7876}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{315929D9-D76E-47E9-BE82-C787FB3A7876}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E10948B-1753-4CD2-ABB7-7A753EEEC023}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7742D113-972D-48FD-BCD9-6F98073CBC3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7742D113-972D-48FD-BCD9-6F98073CBC3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7742D113-972D-48FD-BCD9-6F98073CBC3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7742D113-972D-48FD-BCD9-6F98073CBC3E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FDACBD7-A395-4E8E-B5E1-15BBE70A6D5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{253A9DB7-68EA-4310-A3CA-C7E19450A673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{253A9DB7-68EA-4310-A3CA-C7E19450A673}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{253A9DB7-68EA-4310-A3CA-C7E19450A673}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{253A9DB7-68EA-4310-A3CA-C7E19450A673}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B2B6693-9877-47BB-A2A1-C1E94596AAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B2B6693-9877-47BB-A2A1-C1E94596AAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B2B6693-9877-47BB-A2A1-C1E94596AAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B2B6693-9877-47BB-A2A1-C1E94596AAE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D2D27DE-9BFF-4ABA-B520-D1C81AA9A847}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6D1FF0F-B8A0-4D3C-9F37-513A6456F7B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F7567CA-4918-40F8-B914-0FAB2C7EBFF0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{203C894D-5FF8-4E4A-9812-2674847CC88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{203C894D-5FF8-4E4A-9812-2674847CC88D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{203C894D-5FF8-4E4A-9812-2674847CC88D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{203C894D-5FF8-4E4A-9812-2674847CC88D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B325067A-0447-4097-8E76-1430C0440F6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B325067A-0447-4097-8E76-1430C0440F6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B325067A-0447-4097-8E76-1430C0440F6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B325067A-0447-4097-8E76-1430C0440F6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E098FEF6-66BF-43D3-8A7A-1A4994D3B7C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E098FEF6-66BF-43D3-8A7A-1A4994D3B7C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E098FEF6-66BF-43D3-8A7A-1A4994D3B7C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E098FEF6-66BF-43D3-8A7A-1A4994D3B7C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{92A9467A-9F7E-4294-A7D5-7B59F2E54ABE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{315929D9-D76E-47E9-BE82-C787FB3A7876} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{3E10948B-1753-4CD2-ABB7-7A753EEEC023} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7742D113-972D-48FD-BCD9-6F98073CBC3E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {66C0EAF3-31AB-4772-84E2-3B7304D2860C}
+		SolutionGuid = {5551E9B9-3000-4C32-AE97-0C3D30561263}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
index eea06b03de946f..998703f735c055 100644
--- a/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
+++ b/src/libraries/System.Diagnostics.Tools/System.Diagnostics.Tools.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools.Tests", "tests\System.Diagnostics.Tools.Tests.csproj", "{41BF89E4-8C67-45A6-8044-13009E363220}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95} = {0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools", "src\System.Diagnostics.Tools.csproj", "{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3970F2E-C118-42A8-8C37-C3B99961A9F6} = {F3970F2E-C118-42A8-8C37-C3B99961A9F6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools", "ref\System.Diagnostics.Tools.csproj", "{F3970F2E-C118-42A8-8C37-C3B99961A9F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{84A95700-8F04-4E85-8BAC-CFBC391E06F5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools", "ref\System.Diagnostics.Tools.csproj", "{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools", "src\System.Diagnostics.Tools.csproj", "{566DC861-7C05-45AE-8F59-83D1A175A619}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tools.Tests", "tests\System.Diagnostics.Tools.Tests.csproj", "{A63F3AEA-F4ED-4047-A11F-490325530D92}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{759AFB8B-4AC5-49DE-87FA-EFDE216C6E5E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6AC1A337-2D08-4230-8D95-B52F324F291F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{145D4E24-D451-4F06-8607-E71DD76C1928}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B0BFF379-83B2-4F46-A284-607345663B8C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2347C2C8-22C6-49AC-AD73-4BA65477E8E4}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877} = {145D4E24-D451-4F06-8607-E71DD76C1928}
+		{566DC861-7C05-45AE-8F59-83D1A175A619} = {145D4E24-D451-4F06-8607-E71DD76C1928}
+		{6AC1A337-2D08-4230-8D95-B52F324F291F} = {145D4E24-D451-4F06-8607-E71DD76C1928}
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88} = {B0BFF379-83B2-4F46-A284-607345663B8C}
+		{A63F3AEA-F4ED-4047-A11F-490325530D92} = {B0BFF379-83B2-4F46-A284-607345663B8C}
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5} = {2347C2C8-22C6-49AC-AD73-4BA65477E8E4}
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B} = {2347C2C8-22C6-49AC-AD73-4BA65477E8E4}
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70} = {2347C2C8-22C6-49AC-AD73-4BA65477E8E4}
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C} = {2347C2C8-22C6-49AC-AD73-4BA65477E8E4}
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC} = {2347C2C8-22C6-49AC-AD73-4BA65477E8E4}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41BF89E4-8C67-45A6-8044-13009E363220}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41BF89E4-8C67-45A6-8044-13009E363220}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3970F2E-C118-42A8-8C37-C3B99961A9F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{759AFB8B-4AC5-49DE-87FA-EFDE216C6E5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{759AFB8B-4AC5-49DE-87FA-EFDE216C6E5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{759AFB8B-4AC5-49DE-87FA-EFDE216C6E5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{759AFB8B-4AC5-49DE-87FA-EFDE216C6E5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Debug|Any CPU.Build.0 = Debug|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Debug|x64.ActiveCfg = Debug|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Debug|x64.Build.0 = Debug|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Debug|x86.ActiveCfg = Debug|x86
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Debug|x86.Build.0 = Debug|x86
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Release|Any CPU.ActiveCfg = Release|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Release|Any CPU.Build.0 = Release|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Release|x64.ActiveCfg = Release|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Release|x64.Build.0 = Release|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Release|x86.ActiveCfg = Release|x86
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Release|x86.Build.0 = Release|x86
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Checked|Any CPU.Build.0 = Checked|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Checked|x64.ActiveCfg = Checked|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Checked|x64.Build.0 = Checked|x64
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Checked|x86.ActiveCfg = Checked|x86
+		{4E534B56-D245-41B7-B4D0-F8AB7BCC8877}.Checked|x86.Build.0 = Checked|x86
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Debug|x64.Build.0 = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Debug|x86.Build.0 = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Release|x64.ActiveCfg = Release|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Release|x64.Build.0 = Release|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Release|x86.ActiveCfg = Release|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Release|x86.Build.0 = Release|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6FF6D8F0-403D-40DF-9D75-895E2AF22B88}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Debug|x86.Build.0 = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Release|x64.Build.0 = Release|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Release|x86.Build.0 = Release|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{84A95700-8F04-4E85-8BAC-CFBC391E06F5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Release|x64.Build.0 = Release|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Release|x86.Build.0 = Release|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5F5CCFF-4DBA-4323-82A6-8D472C488C0B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Debug|x64.Build.0 = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Debug|x86.Build.0 = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Release|Any CPU.Build.0 = Release|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Release|x64.ActiveCfg = Release|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Release|x64.Build.0 = Release|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Release|x86.ActiveCfg = Release|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Release|x86.Build.0 = Release|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{566DC861-7C05-45AE-8F59-83D1A175A619}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Debug|x64.Build.0 = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Debug|x86.Build.0 = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Release|x64.ActiveCfg = Release|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Release|x64.Build.0 = Release|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Release|x86.ActiveCfg = Release|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Release|x86.Build.0 = Release|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A63F3AEA-F4ED-4047-A11F-490325530D92}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x64.Build.0 = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Debug|x86.Build.0 = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x64.ActiveCfg = Release|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x64.Build.0 = Release|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x86.ActiveCfg = Release|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Release|x86.Build.0 = Release|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{740703FE-F5E0-4BE0-93B2-63ADD4A3EB70}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x64.Build.0 = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Debug|x86.Build.0 = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x64.ActiveCfg = Release|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x64.Build.0 = Release|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x86.ActiveCfg = Release|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Release|x86.Build.0 = Release|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6AC1A337-2D08-4230-8D95-B52F324F291F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Debug|x64.Build.0 = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Debug|x86.Build.0 = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Release|x64.ActiveCfg = Release|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Release|x64.Build.0 = Release|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Release|x86.ActiveCfg = Release|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Release|x86.Build.0 = Release|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D4A247C6-CBA1-4F2E-86F6-FCB2DDF8C72C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Release|x64.Build.0 = Release|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Release|x86.Build.0 = Release|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8D1E42AE-CF3F-4E02-AC2A-B93ED4295ACC}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{41BF89E4-8C67-45A6-8044-13009E363220} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0B68298B-4672-4CA0-AD25-2F9ABEA1FF95} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F3970F2E-C118-42A8-8C37-C3B99961A9F6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{759AFB8B-4AC5-49DE-87FA-EFDE216C6E5E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E4D04D65-C183-4C51-9ACE-A6D05902B074}
+		SolutionGuid = {74CBBF59-B32F-49B5-9402-F495E129FC3E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
index a952890b43bac2..ae5060c54c8c24 100644
--- a/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
+++ b/src/libraries/System.Diagnostics.TraceSource/System.Diagnostics.TraceSource.sln
@@ -1,130 +1,357 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TraceSource.Tests", "tests\System.Diagnostics.TraceSource.Tests.csproj", "{7B32D24D-969A-4F7F-8461-B43E15E5D553}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5380420C-EB1D-4C53-9CFC-916578C18334} = {5380420C-EB1D-4C53-9CFC-916578C18334}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TraceSource", "src\System.Diagnostics.TraceSource.csproj", "{5380420C-EB1D-4C53-9CFC-916578C18334}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6E515D9C-A5C2-4716-96A1-4716F007267D} = {6E515D9C-A5C2-4716-96A1-4716F007267D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TraceSource", "ref\System.Diagnostics.TraceSource.csproj", "{6E515D9C-A5C2-4716-96A1-4716F007267D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E7B1380E-A870-42F3-AB76-B21B6279E2D9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj", "{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "..\System.Collections.Specialized\src\System.Collections.Specialized.csproj", "{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{95F843FE-38B4-4ED5-81FF-605DE38155F6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{EB38F993-8EA4-466B-AD6B-488768274858}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "..\System.ComponentModel.Primitives\src\System.ComponentModel.Primitives.csproj", "{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{3690CF2A-3BA5-4BC6-BFAA-312A7976C2AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TraceSource", "ref\System.Diagnostics.TraceSource.csproj", "{2F00396E-003A-4385-92DC-69FDBEF330D8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric", "..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj", "{8FE26689-26FA-46B7-9906-C26B5193B93C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TraceSource", "src\System.Diagnostics.TraceSource.csproj", "{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Specialized", "..\System.Collections.Specialized\src\System.Collections.Specialized.csproj", "{0126A981-AC71-4961-9B14-0F78728DDAF6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.TraceSource.Tests", "tests\System.Diagnostics.TraceSource.Tests.csproj", "{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Primitives", "..\System.ComponentModel.Primitives\src\System.ComponentModel.Primitives.csproj", "{FB0D7835-5734-4379-82F3-FBA98FE281EF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process", "..\System.Diagnostics.Process\src\System.Diagnostics.Process.csproj", "{7C1BEC52-C93B-459A-BEF8-02A8122B6466}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem", "..\System.IO.FileSystem\src\System.IO.FileSystem.csproj", "{DA45FFC0-F398-492A-BD72-FC3B0625DF4B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BFDA7EE4-2407-4799-82B0-D977F3363A0D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{2C869A13-107A-47CE-92F7-C0C27CE20E47}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{B4CFBC40-0570-43F1-9752-CFFBFF1FFCF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{637E7769-42D2-4541-9A63-32301113FA5A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices", "..\System.Runtime.InteropServices\src\System.Runtime.InteropServices.csproj", "{C447FF5D-6895-4261-BBD6-18F4FACCA3F4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{FCF0E19F-B81C-41F5-92D8-449C6E577C38}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{2426FD97-9202-498D-806A-E9A41F9B52DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EB3F2772-2ECD-4745-85F7-68A37511BE4C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "..\System.Threading\src\System.Threading.csproj", "{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{463056BB-F827-40A0-B71C-79A96262BCA0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3E90D142-0925-46DE-B139-6C91BAD00059}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B2E7DBDB-8AE8-42FB-9F96-7F635572FF73}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{637E7769-42D2-4541-9A63-32301113FA5A} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB} = {463056BB-F827-40A0-B71C-79A96262BCA0}
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19} = {3E90D142-0925-46DE-B139-6C91BAD00059}
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0} = {3E90D142-0925-46DE-B139-6C91BAD00059}
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9} = {B2E7DBDB-8AE8-42FB-9F96-7F635572FF73}
+		{2F00396E-003A-4385-92DC-69FDBEF330D8} = {B2E7DBDB-8AE8-42FB-9F96-7F635572FF73}
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF} = {B2E7DBDB-8AE8-42FB-9F96-7F635572FF73}
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38} = {B2E7DBDB-8AE8-42FB-9F96-7F635572FF73}
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C} = {B2E7DBDB-8AE8-42FB-9F96-7F635572FF73}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7B32D24D-969A-4F7F-8461-B43E15E5D553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B32D24D-969A-4F7F-8461-B43E15E5D553}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B32D24D-969A-4F7F-8461-B43E15E5D553}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B32D24D-969A-4F7F-8461-B43E15E5D553}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5380420C-EB1D-4C53-9CFC-916578C18334}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5380420C-EB1D-4C53-9CFC-916578C18334}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5380420C-EB1D-4C53-9CFC-916578C18334}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5380420C-EB1D-4C53-9CFC-916578C18334}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E515D9C-A5C2-4716-96A1-4716F007267D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E515D9C-A5C2-4716-96A1-4716F007267D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E515D9C-A5C2-4716-96A1-4716F007267D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E515D9C-A5C2-4716-96A1-4716F007267D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB38F993-8EA4-466B-AD6B-488768274858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB38F993-8EA4-466B-AD6B-488768274858}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB38F993-8EA4-466B-AD6B-488768274858}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB38F993-8EA4-466B-AD6B-488768274858}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3690CF2A-3BA5-4BC6-BFAA-312A7976C2AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3690CF2A-3BA5-4BC6-BFAA-312A7976C2AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3690CF2A-3BA5-4BC6-BFAA-312A7976C2AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3690CF2A-3BA5-4BC6-BFAA-312A7976C2AF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8FE26689-26FA-46B7-9906-C26B5193B93C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8FE26689-26FA-46B7-9906-C26B5193B93C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8FE26689-26FA-46B7-9906-C26B5193B93C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8FE26689-26FA-46B7-9906-C26B5193B93C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0126A981-AC71-4961-9B14-0F78728DDAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0126A981-AC71-4961-9B14-0F78728DDAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0126A981-AC71-4961-9B14-0F78728DDAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0126A981-AC71-4961-9B14-0F78728DDAF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB0D7835-5734-4379-82F3-FBA98FE281EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB0D7835-5734-4379-82F3-FBA98FE281EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB0D7835-5734-4379-82F3-FBA98FE281EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB0D7835-5734-4379-82F3-FBA98FE281EF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C1BEC52-C93B-459A-BEF8-02A8122B6466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C1BEC52-C93B-459A-BEF8-02A8122B6466}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C1BEC52-C93B-459A-BEF8-02A8122B6466}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C1BEC52-C93B-459A-BEF8-02A8122B6466}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA45FFC0-F398-492A-BD72-FC3B0625DF4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA45FFC0-F398-492A-BD72-FC3B0625DF4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA45FFC0-F398-492A-BD72-FC3B0625DF4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA45FFC0-F398-492A-BD72-FC3B0625DF4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C869A13-107A-47CE-92F7-C0C27CE20E47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C869A13-107A-47CE-92F7-C0C27CE20E47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C869A13-107A-47CE-92F7-C0C27CE20E47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C869A13-107A-47CE-92F7-C0C27CE20E47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4CFBC40-0570-43F1-9752-CFFBFF1FFCF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4CFBC40-0570-43F1-9752-CFFBFF1FFCF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4CFBC40-0570-43F1-9752-CFFBFF1FFCF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4CFBC40-0570-43F1-9752-CFFBFF1FFCF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C447FF5D-6895-4261-BBD6-18F4FACCA3F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C447FF5D-6895-4261-BBD6-18F4FACCA3F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C447FF5D-6895-4261-BBD6-18F4FACCA3F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C447FF5D-6895-4261-BBD6-18F4FACCA3F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2426FD97-9202-498D-806A-E9A41F9B52DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2426FD97-9202-498D-806A-E9A41F9B52DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2426FD97-9202-498D-806A-E9A41F9B52DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2426FD97-9202-498D-806A-E9A41F9B52DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Debug|Any CPU.Build.0 = Debug|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Debug|x64.ActiveCfg = Debug|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Debug|x64.Build.0 = Debug|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Debug|x86.ActiveCfg = Debug|x86
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Debug|x86.Build.0 = Debug|x86
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Release|Any CPU.ActiveCfg = Release|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Release|Any CPU.Build.0 = Release|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Release|x64.ActiveCfg = Release|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Release|x64.Build.0 = Release|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Release|x86.ActiveCfg = Release|x86
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Release|x86.Build.0 = Release|x86
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Checked|Any CPU.Build.0 = Checked|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Checked|x64.ActiveCfg = Checked|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Checked|x64.Build.0 = Checked|x64
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Checked|x86.ActiveCfg = Checked|x86
+		{89B01AF7-F0CE-4168-8C4A-33FCDCF33B73}.Checked|x86.Build.0 = Checked|x86
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Release|x64.Build.0 = Release|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Release|x86.Build.0 = Release|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F6BCA6EF-777E-408B-B49B-B055B5A0BA19}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Release|x64.Build.0 = Release|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Release|x86.Build.0 = Release|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E7B1380E-A870-42F3-AB76-B21B6279E2D9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Debug|x64.Build.0 = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Debug|x86.Build.0 = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Release|x64.ActiveCfg = Release|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Release|x64.Build.0 = Release|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Release|x86.ActiveCfg = Release|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Release|x86.Build.0 = Release|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{89C01491-2BE8-438C-8F1D-24DE9AFD7A86}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Debug|x64.Build.0 = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Debug|x86.Build.0 = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Release|x64.ActiveCfg = Release|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Release|x64.Build.0 = Release|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Release|x86.ActiveCfg = Release|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Release|x86.Build.0 = Release|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{64F83961-AECA-4D5C-B467-A1A94AE6FFB4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Debug|x64.Build.0 = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Debug|x86.Build.0 = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Release|x64.ActiveCfg = Release|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Release|x64.Build.0 = Release|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Release|x86.Build.0 = Release|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{95F843FE-38B4-4ED5-81FF-605DE38155F6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Debug|x64.Build.0 = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Debug|x86.Build.0 = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Release|x64.ActiveCfg = Release|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Release|x64.Build.0 = Release|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Release|x86.ActiveCfg = Release|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Release|x86.Build.0 = Release|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{97D756D3-8ECA-45F5-A9F5-DBF659D87BC4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Release|x64.Build.0 = Release|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Release|x86.Build.0 = Release|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2F00396E-003A-4385-92DC-69FDBEF330D8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Debug|x64.Build.0 = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Debug|x86.Build.0 = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Release|x64.ActiveCfg = Release|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Release|x64.Build.0 = Release|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Release|x86.ActiveCfg = Release|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Release|x86.Build.0 = Release|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{48CC1460-B1E7-4DE9-A4E7-2206F7FD54CF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Release|x64.Build.0 = Release|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Release|x86.Build.0 = Release|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0C126AE9-C858-4AC8-9DB1-B8E228BD2DB0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Debug|x86.Build.0 = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Release|x64.Build.0 = Release|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Release|x86.Build.0 = Release|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4DAA5CFC-C59D-4C1B-A12A-BC9863F38C0C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Debug|x86.Build.0 = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x64.Build.0 = Release|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Release|x86.Build.0 = Release|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7D2D4C5A-F0B5-4AD3-8180-87657FB97FAF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x64.Build.0 = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Debug|x86.Build.0 = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x64.ActiveCfg = Release|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x64.Build.0 = Release|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x86.ActiveCfg = Release|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Release|x86.Build.0 = Release|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BFDA7EE4-2407-4799-82B0-D977F3363A0D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Release|x64.Build.0 = Release|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Release|x86.Build.0 = Release|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0A5BC6DA-7ADB-4BF7-8313-DFCE49787EE5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Debug|x64.Build.0 = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Debug|x86.Build.0 = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Release|x64.ActiveCfg = Release|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Release|x64.Build.0 = Release|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Release|x86.ActiveCfg = Release|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Release|x86.Build.0 = Release|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{637E7769-42D2-4541-9A63-32301113FA5A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Debug|x64.Build.0 = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Debug|x86.Build.0 = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Release|x64.ActiveCfg = Release|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Release|x64.Build.0 = Release|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Release|x86.ActiveCfg = Release|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Release|x86.Build.0 = Release|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FCF0E19F-B81C-41F5-92D8-449C6E577C38}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Release|x64.Build.0 = Release|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Release|x86.Build.0 = Release|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EB3F2772-2ECD-4745-85F7-68A37511BE4C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Debug|x64.Build.0 = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Debug|x86.Build.0 = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Release|x64.ActiveCfg = Release|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Release|x64.Build.0 = Release|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Release|x86.Build.0 = Release|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7C0A6923-A9BC-4F10-81E0-C535EEF537BB}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7B32D24D-969A-4F7F-8461-B43E15E5D553} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5380420C-EB1D-4C53-9CFC-916578C18334} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{6E515D9C-A5C2-4716-96A1-4716F007267D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{EB38F993-8EA4-466B-AD6B-488768274858} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3690CF2A-3BA5-4BC6-BFAA-312A7976C2AF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{8FE26689-26FA-46B7-9906-C26B5193B93C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{0126A981-AC71-4961-9B14-0F78728DDAF6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{FB0D7835-5734-4379-82F3-FBA98FE281EF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7C1BEC52-C93B-459A-BEF8-02A8122B6466} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{DA45FFC0-F398-492A-BD72-FC3B0625DF4B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2C869A13-107A-47CE-92F7-C0C27CE20E47} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B4CFBC40-0570-43F1-9752-CFFBFF1FFCF5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C447FF5D-6895-4261-BBD6-18F4FACCA3F4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2426FD97-9202-498D-806A-E9A41F9B52DB} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {124F2F18-059D-4341-9BAF-7C33A33838B4}
+		SolutionGuid = {52B54BB6-271E-45BD-A7A4-D4CEDC973704}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
index 0bba9578a08f75..fd3321e9d15ed6 100644
--- a/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
+++ b/src/libraries/System.Diagnostics.Tracing/System.Diagnostics.Tracing.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing.Tests", "tests\System.Diagnostics.Tracing.Tests.csproj", "{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4} = {EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{370DCE61-CBDF-466E-91DB-5AE622BF2E52}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "src\System.Diagnostics.Tracing.csproj", "{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261} = {0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "ref\System.Diagnostics.Tracing.csproj", "{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "ref\System.Diagnostics.Tracing.csproj", "{D7C16DED-127A-4CBB-BBCF-DF133816413B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "src\System.Diagnostics.Tracing.csproj", "{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing.Tests", "tests\System.Diagnostics.Tracing.Tests.csproj", "{24605C4D-2465-433D-A393-45CB950E0834}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3BCCC297-1869-476C-9861-507BCA01C64A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ADB5AA13-96F9-4A6C-B152-A8295554815E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7ED6F742-A58B-4352-AD32-88F53E65B763}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{7263BACA-10BD-49B4-A4CF-027474094913}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C5364ABB-5EF8-4B6C-9C4F-4BFFA5FEC8CB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0503F4E6-DE85-4812-BEAC-07EB5AAAA246}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{378F97D0-38EC-4DD3-8F38-2E8D81BC1460}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52} = {C5364ABB-5EF8-4B6C-9C4F-4BFFA5FEC8CB}
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E} = {C5364ABB-5EF8-4B6C-9C4F-4BFFA5FEC8CB}
+		{7ED6F742-A58B-4352-AD32-88F53E65B763} = {C5364ABB-5EF8-4B6C-9C4F-4BFFA5FEC8CB}
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168} = {0503F4E6-DE85-4812-BEAC-07EB5AAAA246}
+		{24605C4D-2465-433D-A393-45CB950E0834} = {0503F4E6-DE85-4812-BEAC-07EB5AAAA246}
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A} = {378F97D0-38EC-4DD3-8F38-2E8D81BC1460}
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B} = {378F97D0-38EC-4DD3-8F38-2E8D81BC1460}
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E} = {378F97D0-38EC-4DD3-8F38-2E8D81BC1460}
+		{7263BACA-10BD-49B4-A4CF-027474094913} = {378F97D0-38EC-4DD3-8F38-2E8D81BC1460}
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27} = {378F97D0-38EC-4DD3-8F38-2E8D81BC1460}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E0E1B11-FF70-461E-99F7-C0AF252C0C60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BCCC297-1869-476C-9861-507BCA01C64A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BCCC297-1869-476C-9861-507BCA01C64A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BCCC297-1869-476C-9861-507BCA01C64A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BCCC297-1869-476C-9861-507BCA01C64A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Debug|Any CPU.Build.0 = Debug|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Debug|x64.ActiveCfg = Debug|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Debug|x64.Build.0 = Debug|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Debug|x86.ActiveCfg = Debug|x86
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Debug|x86.Build.0 = Debug|x86
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Release|Any CPU.ActiveCfg = Release|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Release|Any CPU.Build.0 = Release|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Release|x64.ActiveCfg = Release|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Release|x64.Build.0 = Release|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Release|x86.ActiveCfg = Release|x86
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Release|x86.Build.0 = Release|x86
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Checked|Any CPU.Build.0 = Checked|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Checked|x64.ActiveCfg = Checked|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Checked|x64.Build.0 = Checked|x64
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Checked|x86.ActiveCfg = Checked|x86
+		{370DCE61-CBDF-466E-91DB-5AE622BF2E52}.Checked|x86.Build.0 = Checked|x86
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Debug|x64.Build.0 = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Debug|x86.Build.0 = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Release|x64.ActiveCfg = Release|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Release|x64.Build.0 = Release|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Release|x86.Build.0 = Release|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6E159831-C97C-40FD-AD1A-E8B1EE3E7168}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Debug|x64.Build.0 = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Debug|x86.Build.0 = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Release|x64.ActiveCfg = Release|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Release|x64.Build.0 = Release|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Release|x86.ActiveCfg = Release|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Release|x86.Build.0 = Release|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0FA66C9B-5F53-46CB-A226-47EE656FBE6A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Debug|x86.Build.0 = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Release|x64.Build.0 = Release|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Release|x86.Build.0 = Release|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D7C16DED-127A-4CBB-BBCF-DF133816413B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Debug|x64.Build.0 = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Debug|x86.Build.0 = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Release|x64.ActiveCfg = Release|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Release|x64.Build.0 = Release|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Release|x86.ActiveCfg = Release|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Release|x86.Build.0 = Release|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{63783D6D-0848-4303-8E7A-BBB7F65DCE9E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Debug|x64.Build.0 = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Debug|x86.Build.0 = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Release|x64.ActiveCfg = Release|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Release|x64.Build.0 = Release|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Release|x86.ActiveCfg = Release|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Release|x86.Build.0 = Release|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{24605C4D-2465-433D-A393-45CB950E0834}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x64.Build.0 = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Debug|x86.Build.0 = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x64.ActiveCfg = Release|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x64.Build.0 = Release|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x86.ActiveCfg = Release|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Release|x86.Build.0 = Release|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ADB5AA13-96F9-4A6C-B152-A8295554815E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x64.Build.0 = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Debug|x86.Build.0 = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x64.ActiveCfg = Release|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x64.Build.0 = Release|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x86.ActiveCfg = Release|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Release|x86.Build.0 = Release|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7ED6F742-A58B-4352-AD32-88F53E65B763}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Debug|x64.Build.0 = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Debug|x86.Build.0 = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Release|x64.ActiveCfg = Release|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Release|x64.Build.0 = Release|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Release|x86.ActiveCfg = Release|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Release|x86.Build.0 = Release|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7263BACA-10BD-49B4-A4CF-027474094913}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Debug|x64.Build.0 = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Debug|x86.Build.0 = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Release|x64.ActiveCfg = Release|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Release|x64.Build.0 = Release|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Release|x86.ActiveCfg = Release|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Release|x86.Build.0 = Release|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4ECEAA1C-7CE9-490E-A10E-BADD2D6F4A27}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7E0E1B11-FF70-461E-99F7-C0AF252C0C60} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{EB880FDC-326D-42B3-A3FD-0CD3BA29A7F4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{0D8C8BAE-E5A5-4E9F-B101-3D18BD81D261} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3BCCC297-1869-476C-9861-507BCA01C64A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F3456474-9A6A-44C4-AE63-1D33EE9DAC10}
+		SolutionGuid = {5AB76D2F-E758-4FA1-83E4-E5645849CC34}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
index da3fe52c75338e..8ececc3ede1331 100644
--- a/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
+++ b/src/libraries/System.DirectoryServices.AccountManagement/System.DirectoryServices.AccountManagement.sln
@@ -1,60 +1,205 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement.Tests", "tests\System.DirectoryServices.AccountManagement.Tests.csproj", "{B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{879C23DC-D828-4DFB-8E92-ABBC11B71035} = {879C23DC-D828-4DFB-8E92-ABBC11B71035}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{05604AC6-E1DA-460E-9A38-57EB19BE3327}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "src\System.DirectoryServices.AccountManagement.csproj", "{879C23DC-D828-4DFB-8E92-ABBC11B71035}"
-	ProjectSection(ProjectDependencies) = postProject
-		{404455B6-466C-4F78-9DCC-C37DCC0B75DA} = {404455B6-466C-4F78-9DCC-C37DCC0B75DA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{6AAD6E1C-3E25-423C-B19B-7216A12EA75B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "ref\System.DirectoryServices.AccountManagement.csproj", "{404455B6-466C-4F78-9DCC-C37DCC0B75DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{33637A81-A335-474A-814D-648881BB403B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{A62FC401-7B8B-4CDE-8D46-3776980C94F0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "ref\System.DirectoryServices.AccountManagement.csproj", "{7BC4C9CF-F8E4-424B-9F30-237B801F435D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "src\System.DirectoryServices.AccountManagement.csproj", "{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{481EC106-6480-409E-93E3-DF8FE0F401C8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement.Tests", "tests\System.DirectoryServices.AccountManagement.Tests.csproj", "{44080626-DF98-470B-BCA1-CC3DFFCB94E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\ref\System.DirectoryServices.Protocols.csproj", "{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{8D48B49B-398F-4536-B436-AAD50A7F54B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{20D14386-C6D6-4B4D-B56B-0C8E645C704C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{15240A5C-430F-4EAA-81DE-7CE7BCD94BDE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{E535C2F0-BA22-4D75-875B-54FAEF9AF684}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1D411219-F307-4B9D-937E-553171FDB3D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{86B6EA46-F6CC-48D6-947D-77879D89658D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{29AA77E4-EC5E-4F26-B07C-BDD8D3DD51DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{A4070DDC-AC2C-43C8-BF61-3A185C3F6D20}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{A6769C35-8C53-46BF-84AE-44C921C39BEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{10F92CA0-8897-420A-9963-F46BC1274D28}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{BD5EC230-228C-4F5F-B580-F87AAFC8D9B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{433BCBD4-7006-4D1C-A940-C02CE70C79E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{CDF9EADE-78CA-4775-8961-D52E066432C9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{23EAA0CB-A705-4E20-AD71-61D829EA2E46}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D7D9053F-2CE4-40B6-B73A-A0496FA58375}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327} = {23EAA0CB-A705-4E20-AD71-61D829EA2E46}
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3} = {23EAA0CB-A705-4E20-AD71-61D829EA2E46}
+		{6AAD6E1C-3E25-423C-B19B-7216A12EA75B} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{33637A81-A335-474A-814D-648881BB403B} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{20D14386-C6D6-4B4D-B56B-0C8E645C704C} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{15240A5C-430F-4EAA-81DE-7CE7BCD94BDE} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{1D411219-F307-4B9D-937E-553171FDB3D3} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{29AA77E4-EC5E-4F26-B07C-BDD8D3DD51DE} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{10F92CA0-8897-420A-9963-F46BC1274D28} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{BD5EC230-228C-4F5F-B580-F87AAFC8D9B0} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{CDF9EADE-78CA-4775-8961-D52E066432C9} = {F9BF99E8-37B3-4FFD-BB57-B596C03ABD2C}
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{E535C2F0-BA22-4D75-875B-54FAEF9AF684} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{86B6EA46-F6CC-48D6-947D-77879D89658D} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{A4070DDC-AC2C-43C8-BF61-3A185C3F6D20} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{433BCBD4-7006-4D1C-A940-C02CE70C79E8} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A} = {D7D9053F-2CE4-40B6-B73A-A0496FA58375}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0EE498E-4BD8-4A39-89EB-7F2FC880B61F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{879C23DC-D828-4DFB-8E92-ABBC11B71035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{879C23DC-D828-4DFB-8E92-ABBC11B71035}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{879C23DC-D828-4DFB-8E92-ABBC11B71035}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{879C23DC-D828-4DFB-8E92-ABBC11B71035}.Release|Any CPU.Build.0 = Release|Any CPU
-		{404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{404455B6-466C-4F78-9DCC-C37DCC0B75DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{481EC106-6480-409E-93E3-DF8FE0F401C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{481EC106-6480-409E-93E3-DF8FE0F401C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{481EC106-6480-409E-93E3-DF8FE0F401C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{481EC106-6480-409E-93E3-DF8FE0F401C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05604AC6-E1DA-460E-9A38-57EB19BE3327}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AAD6E1C-3E25-423C-B19B-7216A12EA75B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AAD6E1C-3E25-423C-B19B-7216A12EA75B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AAD6E1C-3E25-423C-B19B-7216A12EA75B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AAD6E1C-3E25-423C-B19B-7216A12EA75B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33637A81-A335-474A-814D-648881BB403B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A62FC401-7B8B-4CDE-8D46-3776980C94F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BC4C9CF-F8E4-424B-9F30-237B801F435D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DCEDAE6-45FC-402B-AAE4-14AD66B73D30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44080626-DF98-470B-BCA1-CC3DFFCB94E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{469EBD55-AEA1-4AF5-BBC6-F9938C7DAAC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBE4B576-2E74-4A45-87E6-CCF652F6ADE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D48B49B-398F-4536-B436-AAD50A7F54B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F8B3E04-A81F-4AD1-B82A-3E58F030D52A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20D14386-C6D6-4B4D-B56B-0C8E645C704C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20D14386-C6D6-4B4D-B56B-0C8E645C704C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20D14386-C6D6-4B4D-B56B-0C8E645C704C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20D14386-C6D6-4B4D-B56B-0C8E645C704C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15240A5C-430F-4EAA-81DE-7CE7BCD94BDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15240A5C-430F-4EAA-81DE-7CE7BCD94BDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15240A5C-430F-4EAA-81DE-7CE7BCD94BDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15240A5C-430F-4EAA-81DE-7CE7BCD94BDE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E535C2F0-BA22-4D75-875B-54FAEF9AF684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E535C2F0-BA22-4D75-875B-54FAEF9AF684}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E535C2F0-BA22-4D75-875B-54FAEF9AF684}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E535C2F0-BA22-4D75-875B-54FAEF9AF684}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D411219-F307-4B9D-937E-553171FDB3D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D411219-F307-4B9D-937E-553171FDB3D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D411219-F307-4B9D-937E-553171FDB3D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D411219-F307-4B9D-937E-553171FDB3D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86B6EA46-F6CC-48D6-947D-77879D89658D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86B6EA46-F6CC-48D6-947D-77879D89658D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86B6EA46-F6CC-48D6-947D-77879D89658D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86B6EA46-F6CC-48D6-947D-77879D89658D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29AA77E4-EC5E-4F26-B07C-BDD8D3DD51DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29AA77E4-EC5E-4F26-B07C-BDD8D3DD51DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29AA77E4-EC5E-4F26-B07C-BDD8D3DD51DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29AA77E4-EC5E-4F26-B07C-BDD8D3DD51DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4070DDC-AC2C-43C8-BF61-3A185C3F6D20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4070DDC-AC2C-43C8-BF61-3A185C3F6D20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4070DDC-AC2C-43C8-BF61-3A185C3F6D20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4070DDC-AC2C-43C8-BF61-3A185C3F6D20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A96F44C4-4CB8-41EB-ABBF-1C6E12664BCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6769C35-8C53-46BF-84AE-44C921C39BEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10F92CA0-8897-420A-9963-F46BC1274D28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46B233B0-01EA-4569-BDA9-1A7526FAF6E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD5EC230-228C-4F5F-B580-F87AAFC8D9B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5EC230-228C-4F5F-B580-F87AAFC8D9B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD5EC230-228C-4F5F-B580-F87AAFC8D9B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD5EC230-228C-4F5F-B580-F87AAFC8D9B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{433BCBD4-7006-4D1C-A940-C02CE70C79E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{433BCBD4-7006-4D1C-A940-C02CE70C79E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{433BCBD4-7006-4D1C-A940-C02CE70C79E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{433BCBD4-7006-4D1C-A940-C02CE70C79E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDF9EADE-78CA-4775-8961-D52E066432C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A82F83FE-3B02-4EAA-8763-1D43AB0E4E6A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B0EE498E-4BD8-4A39-89EB-7F2FC880B61F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{879C23DC-D828-4DFB-8E92-ABBC11B71035} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{404455B6-466C-4F78-9DCC-C37DCC0B75DA} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{481EC106-6480-409E-93E3-DF8FE0F401C8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6D2C151C-899E-483D-9E18-F1E22EB5425C}
+		SolutionGuid = {600939C3-C746-4C12-9FA6-82208BD6CD03}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
index 53d9cc5881a757..63626c1ecbc932 100644
--- a/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
+++ b/src/libraries/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.sln
@@ -1,60 +1,163 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols.Tests", "tests\System.DirectoryServices.Protocols.Tests.csproj", "{6638C675-CD62-408F-AB3B-AAFD8A906A96}"
-	ProjectSection(ProjectDependencies) = postProject
-		{135980AC-4583-44EC-894E-CB3B1A481920} = {135980AC-4583-44EC-894E-CB3B1A481920}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{59D900EB-CABB-4CA9-9BE4-9855ADC32752}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "src\System.DirectoryServices.Protocols.csproj", "{135980AC-4583-44EC-894E-CB3B1A481920}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7DEA4539-9A0D-4801-B229-3824710EBCEE} = {7DEA4539-9A0D-4801-B229-3824710EBCEE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4C8719E1-4301-4EA0-A22B-E17D1B86C9EA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "ref\System.DirectoryServices.Protocols.csproj", "{7DEA4539-9A0D-4801-B229-3824710EBCEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "ref\System.DirectoryServices.Protocols.csproj", "{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "src\System.DirectoryServices.Protocols.csproj", "{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols.Tests", "tests\System.DirectoryServices.Protocols.Tests.csproj", "{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B71108C0-4466-472C-880D-B54081E7E16A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{E1F18567-C282-456B-8CCC-677702609FAF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{B90CD66C-B99D-4297-BF0F-CD87EFE28C8E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{7E6C77DE-BA1C-4588-810E-15F4B971415C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{49E93F4F-C28A-42B0-A255-6C3674E785EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{15B6E2E8-5FF8-4605-AF19-CE2C45E71811}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BA3BA91C-55C5-40FC-B322-DCA0EED59F6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{64DCED12-0305-447A-A0E0-0B8FCDD1EC45}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{167E89F1-63F0-4E47-B67E-9931589E75CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{3AFC36D9-1F61-4AE7-AE29-CE54105D32B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{CB3DF0FB-A195-48BE-AC18-EAE9DCEE9155}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{19B414C5-ACD0-4E78-B0A0-C698132F1988}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{61E4FC4B-B018-463C-84AE-D34F740DD229}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7A5D64CF-1206-4815-89D0-2CC798162E6C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752} = {61E4FC4B-B018-463C-84AE-D34F740DD229}
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0} = {61E4FC4B-B018-463C-84AE-D34F740DD229}
+		{4C8719E1-4301-4EA0-A22B-E17D1B86C9EA} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{B90CD66C-B99D-4297-BF0F-CD87EFE28C8E} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{7E6C77DE-BA1C-4588-810E-15F4B971415C} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{BA3BA91C-55C5-40FC-B322-DCA0EED59F6C} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{3AFC36D9-1F61-4AE7-AE29-CE54105D32B8} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1} = {7A5D64CF-1206-4815-89D0-2CC798162E6C}
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{E1F18567-C282-456B-8CCC-677702609FAF} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{49E93F4F-C28A-42B0-A255-6C3674E785EB} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{15B6E2E8-5FF8-4605-AF19-CE2C45E71811} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{64DCED12-0305-447A-A0E0-0B8FCDD1EC45} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{167E89F1-63F0-4E47-B67E-9931589E75CE} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{CB3DF0FB-A195-48BE-AC18-EAE9DCEE9155} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988} = {1D8E89E0-C9F4-445F-B6C2-C9C03E74A71D}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6638C675-CD62-408F-AB3B-AAFD8A906A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6638C675-CD62-408F-AB3B-AAFD8A906A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6638C675-CD62-408F-AB3B-AAFD8A906A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6638C675-CD62-408F-AB3B-AAFD8A906A96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{135980AC-4583-44EC-894E-CB3B1A481920}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{135980AC-4583-44EC-894E-CB3B1A481920}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{135980AC-4583-44EC-894E-CB3B1A481920}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{135980AC-4583-44EC-894E-CB3B1A481920}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DEA4539-9A0D-4801-B229-3824710EBCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DEA4539-9A0D-4801-B229-3824710EBCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DEA4539-9A0D-4801-B229-3824710EBCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DEA4539-9A0D-4801-B229-3824710EBCEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B71108C0-4466-472C-880D-B54081E7E16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B71108C0-4466-472C-880D-B54081E7E16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B71108C0-4466-472C-880D-B54081E7E16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B71108C0-4466-472C-880D-B54081E7E16A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59D900EB-CABB-4CA9-9BE4-9855ADC32752}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C8719E1-4301-4EA0-A22B-E17D1B86C9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C8719E1-4301-4EA0-A22B-E17D1B86C9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C8719E1-4301-4EA0-A22B-E17D1B86C9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C8719E1-4301-4EA0-A22B-E17D1B86C9EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E61CD2AC-E0BB-4FC4-99D3-528AEDDB271B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71D4A6E0-0A63-4232-9EBB-E2D46C7E69B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{621B4749-CFCE-4CC9-8B1E-A0AA26A4FCD0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7E5B25A-0E3A-4FF8-958C-3FEB057DE330}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1F18567-C282-456B-8CCC-677702609FAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B90CD66C-B99D-4297-BF0F-CD87EFE28C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B90CD66C-B99D-4297-BF0F-CD87EFE28C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B90CD66C-B99D-4297-BF0F-CD87EFE28C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B90CD66C-B99D-4297-BF0F-CD87EFE28C8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E6C77DE-BA1C-4588-810E-15F4B971415C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E6C77DE-BA1C-4588-810E-15F4B971415C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E6C77DE-BA1C-4588-810E-15F4B971415C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E6C77DE-BA1C-4588-810E-15F4B971415C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49E93F4F-C28A-42B0-A255-6C3674E785EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49E93F4F-C28A-42B0-A255-6C3674E785EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49E93F4F-C28A-42B0-A255-6C3674E785EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49E93F4F-C28A-42B0-A255-6C3674E785EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F939D8A3-E1D3-4E42-A4B1-BAACE52FC130}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15B6E2E8-5FF8-4605-AF19-CE2C45E71811}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA3BA91C-55C5-40FC-B322-DCA0EED59F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA3BA91C-55C5-40FC-B322-DCA0EED59F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA3BA91C-55C5-40FC-B322-DCA0EED59F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA3BA91C-55C5-40FC-B322-DCA0EED59F6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64DCED12-0305-447A-A0E0-0B8FCDD1EC45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64DCED12-0305-447A-A0E0-0B8FCDD1EC45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64DCED12-0305-447A-A0E0-0B8FCDD1EC45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64DCED12-0305-447A-A0E0-0B8FCDD1EC45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{493BCA01-A5FC-4C5A-9E85-A0E23E3CD425}.Release|Any CPU.Build.0 = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{167E89F1-63F0-4E47-B67E-9931589E75CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AFC36D9-1F61-4AE7-AE29-CE54105D32B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AFC36D9-1F61-4AE7-AE29-CE54105D32B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AFC36D9-1F61-4AE7-AE29-CE54105D32B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AFC36D9-1F61-4AE7-AE29-CE54105D32B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB3DF0FB-A195-48BE-AC18-EAE9DCEE9155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB3DF0FB-A195-48BE-AC18-EAE9DCEE9155}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB3DF0FB-A195-48BE-AC18-EAE9DCEE9155}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB3DF0FB-A195-48BE-AC18-EAE9DCEE9155}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC53B586-F702-4B0C-94A9-A6F066FDC4C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19B414C5-ACD0-4E78-B0A0-C698132F1988}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6638C675-CD62-408F-AB3B-AAFD8A906A96} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{135980AC-4583-44EC-894E-CB3B1A481920} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7DEA4539-9A0D-4801-B229-3824710EBCEE} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{B71108C0-4466-472C-880D-B54081E7E16A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DBE446A9-A8D4-47DC-AF12-E8FA5BF9685C}
+		SolutionGuid = {FA8DCCFE-EDCD-4086-AD0B-5089B54BC658}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
index 2aae01bdabd746..e11ab396935f53 100644
--- a/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
+++ b/src/libraries/System.DirectoryServices/System.DirectoryServices.sln
@@ -1,60 +1,149 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Tests", "tests\System.DirectoryServices.Tests.csproj", "{DDE3838B-0EEA-4D9A-A120-9D72CB33F250}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28} = {EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1A19656D-1047-4E43-B9C5-73423399D1D4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "src\System.DirectoryServices.csproj", "{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CBCDA53B-4C01-4267-B08C-413205FE4D8D} = {CBCDA53B-4C01-4267-B08C-413205FE4D8D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{6BB2B70D-0D80-4774-B0F4-E7C92FC58987}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "ref\System.DirectoryServices.csproj", "{CBCDA53B-4C01-4267-B08C-413205FE4D8D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "ref\System.DirectoryServices.csproj", "{DB7964E8-6761-47C7-B120-DAF13FDDE01B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "src\System.DirectoryServices.csproj", "{6870504E-8490-4A4C-938A-C68DA9A2F65D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Tests", "tests\System.DirectoryServices.Tests.csproj", "{197926DA-9180-4AD4-AC71-B95FC5CA7557}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{09EAF02A-CD00-4440-A7CF-7355EC5DC85A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7140F6A9-8DBB-4D3C-87D4-0DCF5181B3E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{F456A804-449A-4CF4-AEAF-9C48430E6E8F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{D6944D25-E75D-45AA-8C58-D61254B77BCA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B2ED534B-CB42-4F20-9AD9-707CFF08D73F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{97F1F297-B6BC-4CD8-9E44-C682CA36A434}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{35B03979-8DA5-48FA-8DF6-AA7A8C6153CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{BEDD1BB8-E5AF-4FD0-BB90-E928D022BE4D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{E2B0069E-C11C-4829-87C8-A98ED298CB8A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{BCA7A7F1-6049-4D51-97A0-E3B9B2A227B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{1937FA8B-D798-494B-825A-E772546415B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{169CCBAE-5490-4409-9CC7-48850ABA1BE8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{B3473ABA-A06B-445E-AE21-C7432AD14482}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0A80176F-E288-41E5-AFEA-C9291566EA95}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E3CDCC59-B1B9-4084-A059-D6145BBE43E6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7D929B0F-C595-4D90-BC2B-FBAF461CD311}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1A19656D-1047-4E43-B9C5-73423399D1D4} = {0A80176F-E288-41E5-AFEA-C9291566EA95}
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557} = {0A80176F-E288-41E5-AFEA-C9291566EA95}
+		{6BB2B70D-0D80-4774-B0F4-E7C92FC58987} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{09EAF02A-CD00-4440-A7CF-7355EC5DC85A} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{F456A804-449A-4CF4-AEAF-9C48430E6E8F} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{B2ED534B-CB42-4F20-9AD9-707CFF08D73F} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{35B03979-8DA5-48FA-8DF6-AA7A8C6153CF} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{BCA7A7F1-6049-4D51-97A0-E3B9B2A227B7} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8} = {E3CDCC59-B1B9-4084-A059-D6145BBE43E6}
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+		{D6944D25-E75D-45AA-8C58-D61254B77BCA} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+		{97F1F297-B6BC-4CD8-9E44-C682CA36A434} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+		{BEDD1BB8-E5AF-4FD0-BB90-E928D022BE4D} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+		{1937FA8B-D798-494B-825A-E772546415B6} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+		{B3473ABA-A06B-445E-AE21-C7432AD14482} = {7D929B0F-C595-4D90-BC2B-FBAF461CD311}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDE3838B-0EEA-4D9A-A120-9D72CB33F250}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBCDA53B-4C01-4267-B08C-413205FE4D8D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7140F6A9-8DBB-4D3C-87D4-0DCF5181B3E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7140F6A9-8DBB-4D3C-87D4-0DCF5181B3E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7140F6A9-8DBB-4D3C-87D4-0DCF5181B3E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7140F6A9-8DBB-4D3C-87D4-0DCF5181B3E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A19656D-1047-4E43-B9C5-73423399D1D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BB2B70D-0D80-4774-B0F4-E7C92FC58987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BB2B70D-0D80-4774-B0F4-E7C92FC58987}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BB2B70D-0D80-4774-B0F4-E7C92FC58987}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BB2B70D-0D80-4774-B0F4-E7C92FC58987}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB7964E8-6761-47C7-B120-DAF13FDDE01B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6870504E-8490-4A4C-938A-C68DA9A2F65D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{197926DA-9180-4AD4-AC71-B95FC5CA7557}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09EAF02A-CD00-4440-A7CF-7355EC5DC85A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09EAF02A-CD00-4440-A7CF-7355EC5DC85A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09EAF02A-CD00-4440-A7CF-7355EC5DC85A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09EAF02A-CD00-4440-A7CF-7355EC5DC85A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F456A804-449A-4CF4-AEAF-9C48430E6E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F456A804-449A-4CF4-AEAF-9C48430E6E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F456A804-449A-4CF4-AEAF-9C48430E6E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F456A804-449A-4CF4-AEAF-9C48430E6E8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6944D25-E75D-45AA-8C58-D61254B77BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6944D25-E75D-45AA-8C58-D61254B77BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6944D25-E75D-45AA-8C58-D61254B77BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6944D25-E75D-45AA-8C58-D61254B77BCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2ED534B-CB42-4F20-9AD9-707CFF08D73F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97F1F297-B6BC-4CD8-9E44-C682CA36A434}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35B03979-8DA5-48FA-8DF6-AA7A8C6153CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35B03979-8DA5-48FA-8DF6-AA7A8C6153CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35B03979-8DA5-48FA-8DF6-AA7A8C6153CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35B03979-8DA5-48FA-8DF6-AA7A8C6153CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEDD1BB8-E5AF-4FD0-BB90-E928D022BE4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEDD1BB8-E5AF-4FD0-BB90-E928D022BE4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEDD1BB8-E5AF-4FD0-BB90-E928D022BE4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEDD1BB8-E5AF-4FD0-BB90-E928D022BE4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C40C15E4-8060-4295-9B8F-E04F94BFDA2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2B0069E-C11C-4829-87C8-A98ED298CB8A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCA7A7F1-6049-4D51-97A0-E3B9B2A227B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCA7A7F1-6049-4D51-97A0-E3B9B2A227B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCA7A7F1-6049-4D51-97A0-E3B9B2A227B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCA7A7F1-6049-4D51-97A0-E3B9B2A227B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1937FA8B-D798-494B-825A-E772546415B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1937FA8B-D798-494B-825A-E772546415B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1937FA8B-D798-494B-825A-E772546415B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1937FA8B-D798-494B-825A-E772546415B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{169CCBAE-5490-4409-9CC7-48850ABA1BE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3473ABA-A06B-445E-AE21-C7432AD14482}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{DDE3838B-0EEA-4D9A-A120-9D72CB33F250} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{EC9B0FBC-C3A2-44E6-BFC6-51E565061C28} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{CBCDA53B-4C01-4267-B08C-413205FE4D8D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7140F6A9-8DBB-4D3C-87D4-0DCF5181B3E2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {88FABF55-3145-4BBD-908F-BDB2AEB4742B}
+		SolutionGuid = {9DE1DE68-219A-4A5E-83A8-C0F0637EE9DF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
index df9023ce87dd33..983102249b9e02 100644
--- a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
+++ b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln
@@ -1,60 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29102.190
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.Tests", "tests\System.Drawing.Common.Tests.csproj", "{4B93E684-0630-45F4-8F63-6C7788C9892F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{191B3618-FECD-4ABD-9D6B-5AC90DC33621} = {191B3618-FECD-4ABD-9D6B-5AC90DC33621}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1C4EEE9D-AF5E-4C94-A5A7-3EFD83A19A86}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "src\System.Drawing.Common.csproj", "{191B3618-FECD-4ABD-9D6B-5AC90DC33621}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D7AEA698-275D-441F-B7A7-8491D1F0EFF0} = {D7AEA698-275D-441F-B7A7-8491D1F0EFF0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{F9F48FD6-B4DC-48D7-B893-9AF63F2F1B70}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "ref\System.Drawing.Common.csproj", "{D7AEA698-275D-441F-B7A7-8491D1F0EFF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{83CA6F97-678B-40A7-A9DF-C94A46B8B18A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{4BBDE239-6D43-43C0-AF72-25116A49A9E0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "ref\System.Drawing.Common.csproj", "{790BF98D-7616-410C-BEF8-2CBA7E7601BB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "src\System.Drawing.Common.csproj", "{F1A41550-378D-4651-915F-263BD9AB460E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E9562452-8420-4C95-A129-DADD0F35D168}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.Tests", "tests\System.Drawing.Common.Tests.csproj", "{F14479F4-611E-49DA-BB07-74C0AB096FB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D04E4F54-5141-48A6-B56B-38227CC937E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3C46E509-7690-4467-9399-23B213F8236A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{50C80896-2D86-49EF-BBA6-330D902DF948}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{AD354584-CFB3-49C9-801A-F773DC271A2A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{78608B5B-3BBB-4201-AF82-D6D973CB993B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5E2AC679-D984-444B-9C4B-285EF6F63AF0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E1965D61-D899-4AEA-BF92-9597B18392F5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1C4EEE9D-AF5E-4C94-A5A7-3EFD83A19A86} = {78608B5B-3BBB-4201-AF82-D6D973CB993B}
+		{F14479F4-611E-49DA-BB07-74C0AB096FB5} = {78608B5B-3BBB-4201-AF82-D6D973CB993B}
+		{F9F48FD6-B4DC-48D7-B893-9AF63F2F1B70} = {5E2AC679-D984-444B-9C4B-285EF6F63AF0}
+		{83CA6F97-678B-40A7-A9DF-C94A46B8B18A} = {5E2AC679-D984-444B-9C4B-285EF6F63AF0}
+		{790BF98D-7616-410C-BEF8-2CBA7E7601BB} = {5E2AC679-D984-444B-9C4B-285EF6F63AF0}
+		{D04E4F54-5141-48A6-B56B-38227CC937E0} = {5E2AC679-D984-444B-9C4B-285EF6F63AF0}
+		{50C80896-2D86-49EF-BBA6-330D902DF948} = {5E2AC679-D984-444B-9C4B-285EF6F63AF0}
+		{AD354584-CFB3-49C9-801A-F773DC271A2A} = {5E2AC679-D984-444B-9C4B-285EF6F63AF0}
+		{4BBDE239-6D43-43C0-AF72-25116A49A9E0} = {E1965D61-D899-4AEA-BF92-9597B18392F5}
+		{F1A41550-378D-4651-915F-263BD9AB460E} = {E1965D61-D899-4AEA-BF92-9597B18392F5}
+		{3C46E509-7690-4467-9399-23B213F8236A} = {E1965D61-D899-4AEA-BF92-9597B18392F5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4B93E684-0630-45F4-8F63-6C7788C9892F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B93E684-0630-45F4-8F63-6C7788C9892F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B93E684-0630-45F4-8F63-6C7788C9892F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B93E684-0630-45F4-8F63-6C7788C9892F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{191B3618-FECD-4ABD-9D6B-5AC90DC33621}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7AEA698-275D-441F-B7A7-8491D1F0EFF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9562452-8420-4C95-A129-DADD0F35D168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9562452-8420-4C95-A129-DADD0F35D168}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9562452-8420-4C95-A129-DADD0F35D168}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9562452-8420-4C95-A129-DADD0F35D168}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C4EEE9D-AF5E-4C94-A5A7-3EFD83A19A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C4EEE9D-AF5E-4C94-A5A7-3EFD83A19A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C4EEE9D-AF5E-4C94-A5A7-3EFD83A19A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C4EEE9D-AF5E-4C94-A5A7-3EFD83A19A86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9F48FD6-B4DC-48D7-B893-9AF63F2F1B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9F48FD6-B4DC-48D7-B893-9AF63F2F1B70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9F48FD6-B4DC-48D7-B893-9AF63F2F1B70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9F48FD6-B4DC-48D7-B893-9AF63F2F1B70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83CA6F97-678B-40A7-A9DF-C94A46B8B18A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83CA6F97-678B-40A7-A9DF-C94A46B8B18A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83CA6F97-678B-40A7-A9DF-C94A46B8B18A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83CA6F97-678B-40A7-A9DF-C94A46B8B18A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4BBDE239-6D43-43C0-AF72-25116A49A9E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4BBDE239-6D43-43C0-AF72-25116A49A9E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4BBDE239-6D43-43C0-AF72-25116A49A9E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4BBDE239-6D43-43C0-AF72-25116A49A9E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{790BF98D-7616-410C-BEF8-2CBA7E7601BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{790BF98D-7616-410C-BEF8-2CBA7E7601BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{790BF98D-7616-410C-BEF8-2CBA7E7601BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{790BF98D-7616-410C-BEF8-2CBA7E7601BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1A41550-378D-4651-915F-263BD9AB460E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1A41550-378D-4651-915F-263BD9AB460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1A41550-378D-4651-915F-263BD9AB460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1A41550-378D-4651-915F-263BD9AB460E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F14479F4-611E-49DA-BB07-74C0AB096FB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D04E4F54-5141-48A6-B56B-38227CC937E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D04E4F54-5141-48A6-B56B-38227CC937E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D04E4F54-5141-48A6-B56B-38227CC937E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D04E4F54-5141-48A6-B56B-38227CC937E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C46E509-7690-4467-9399-23B213F8236A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C46E509-7690-4467-9399-23B213F8236A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C46E509-7690-4467-9399-23B213F8236A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C46E509-7690-4467-9399-23B213F8236A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{50C80896-2D86-49EF-BBA6-330D902DF948}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{50C80896-2D86-49EF-BBA6-330D902DF948}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{50C80896-2D86-49EF-BBA6-330D902DF948}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{50C80896-2D86-49EF-BBA6-330D902DF948}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD354584-CFB3-49C9-801A-F773DC271A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD354584-CFB3-49C9-801A-F773DC271A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD354584-CFB3-49C9-801A-F773DC271A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD354584-CFB3-49C9-801A-F773DC271A2A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4B93E684-0630-45F4-8F63-6C7788C9892F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{191B3618-FECD-4ABD-9D6B-5AC90DC33621} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D7AEA698-275D-441F-B7A7-8491D1F0EFF0} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{E9562452-8420-4C95-A129-DADD0F35D168} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {49ACD6A4-C709-4315-813A-445A840B5574}
+		SolutionGuid = {FE976CDB-4464-48A7-86B9-04DB5E2258DA}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
index c1076b518fb57f..25e2d3f8351449 100644
--- a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
+++ b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln
@@ -1,60 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives.Tests", "tests\System.Drawing.Primitives.Tests.csproj", "{CF54638C-A382-4A78-9AD6-2304CEEFEB01}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {8F472B93-574C-4AEC-9D28-6C2360A55BBF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{39205290-06C5-468E-B5C9-D9C5737909EE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives.csproj", "{8F472B93-574C-4AEC-9D28-6C2360A55BBF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{10F74537-6423-48F5-A7F3-4DE94E42AF8F} = {10F74537-6423-48F5-A7F3-4DE94E42AF8F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{33287638-54E4-4929-AEF4-91C5D1437118}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives", "ref\System.Drawing.Primitives.csproj", "{10F74537-6423-48F5-A7F3-4DE94E42AF8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives", "ref\System.Drawing.Primitives.csproj", "{D2E753F4-34A3-4641-9C0F-53539147CCF2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives.csproj", "{80A68643-0E37-4525-BF06-F50C3BF7B867}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9AC5A9BF-A743-4696-8515-11CB517605A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives.Tests", "tests\System.Drawing.Primitives.Tests.csproj", "{515B6C1E-757F-497E-9707-37B5822FFC9A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CE015CAB-D2C5-4525-B2E5-1020BADB211A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4698E870-A129-44D0-A890-98BAB02ECE0C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{9E7CE42D-F172-404E-90B6-706AEEA2F786}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{A3C3610E-58F1-4ABB-9CDB-F7F6814E16CC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{86A52552-D633-489E-995E-DD3B7EA3E328}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6FF7D690-F4BF-45A0-881A-5792FC192220}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70CC53D2-00D6-4119-8F53-5F3B8FF58107}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{39205290-06C5-468E-B5C9-D9C5737909EE} = {86A52552-D633-489E-995E-DD3B7EA3E328}
+		{515B6C1E-757F-497E-9707-37B5822FFC9A} = {86A52552-D633-489E-995E-DD3B7EA3E328}
+		{33287638-54E4-4929-AEF4-91C5D1437118} = {6FF7D690-F4BF-45A0-881A-5792FC192220}
+		{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB} = {6FF7D690-F4BF-45A0-881A-5792FC192220}
+		{D2E753F4-34A3-4641-9C0F-53539147CCF2} = {6FF7D690-F4BF-45A0-881A-5792FC192220}
+		{CE015CAB-D2C5-4525-B2E5-1020BADB211A} = {6FF7D690-F4BF-45A0-881A-5792FC192220}
+		{9E7CE42D-F172-404E-90B6-706AEEA2F786} = {6FF7D690-F4BF-45A0-881A-5792FC192220}
+		{A3C3610E-58F1-4ABB-9CDB-F7F6814E16CC} = {6FF7D690-F4BF-45A0-881A-5792FC192220}
+		{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67} = {70CC53D2-00D6-4119-8F53-5F3B8FF58107}
+		{80A68643-0E37-4525-BF06-F50C3BF7B867} = {70CC53D2-00D6-4119-8F53-5F3B8FF58107}
+		{4698E870-A129-44D0-A890-98BAB02ECE0C} = {70CC53D2-00D6-4119-8F53-5F3B8FF58107}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9AC5A9BF-A743-4696-8515-11CB517605A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AC5A9BF-A743-4696-8515-11CB517605A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9AC5A9BF-A743-4696-8515-11CB517605A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9AC5A9BF-A743-4696-8515-11CB517605A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39205290-06C5-468E-B5C9-D9C5737909EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39205290-06C5-468E-B5C9-D9C5737909EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39205290-06C5-468E-B5C9-D9C5737909EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39205290-06C5-468E-B5C9-D9C5737909EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33287638-54E4-4929-AEF4-91C5D1437118}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33287638-54E4-4929-AEF4-91C5D1437118}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33287638-54E4-4929-AEF4-91C5D1437118}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33287638-54E4-4929-AEF4-91C5D1437118}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D38394CE-5EEA-4B06-A2C5-EAA8BF04E8AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE77C53C-CB16-487B-9ABE-6A62BC4BAE67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2E753F4-34A3-4641-9C0F-53539147CCF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2E753F4-34A3-4641-9C0F-53539147CCF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2E753F4-34A3-4641-9C0F-53539147CCF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2E753F4-34A3-4641-9C0F-53539147CCF2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80A68643-0E37-4525-BF06-F50C3BF7B867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80A68643-0E37-4525-BF06-F50C3BF7B867}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80A68643-0E37-4525-BF06-F50C3BF7B867}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80A68643-0E37-4525-BF06-F50C3BF7B867}.Release|Any CPU.Build.0 = Release|Any CPU
+		{515B6C1E-757F-497E-9707-37B5822FFC9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{515B6C1E-757F-497E-9707-37B5822FFC9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{515B6C1E-757F-497E-9707-37B5822FFC9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{515B6C1E-757F-497E-9707-37B5822FFC9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE015CAB-D2C5-4525-B2E5-1020BADB211A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4698E870-A129-44D0-A890-98BAB02ECE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4698E870-A129-44D0-A890-98BAB02ECE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4698E870-A129-44D0-A890-98BAB02ECE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4698E870-A129-44D0-A890-98BAB02ECE0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E7CE42D-F172-404E-90B6-706AEEA2F786}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E7CE42D-F172-404E-90B6-706AEEA2F786}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E7CE42D-F172-404E-90B6-706AEEA2F786}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E7CE42D-F172-404E-90B6-706AEEA2F786}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3C3610E-58F1-4ABB-9CDB-F7F6814E16CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3C3610E-58F1-4ABB-9CDB-F7F6814E16CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3C3610E-58F1-4ABB-9CDB-F7F6814E16CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3C3610E-58F1-4ABB-9CDB-F7F6814E16CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CF54638C-A382-4A78-9AD6-2304CEEFEB01} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{10F74537-6423-48F5-A7F3-4DE94E42AF8F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9AC5A9BF-A743-4696-8515-11CB517605A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B9974179-A25A-4E7A-A743-D4562E707796}
+		SolutionGuid = {E2DD25F1-FA29-41D5-AB37-65DDC6A49304}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
index d839ee5a9e14fb..8b57e208814e0b 100644
--- a/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
+++ b/src/libraries/System.Dynamic.Runtime/System.Dynamic.Runtime.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime.Tests", "tests\System.Dynamic.Runtime.Tests.csproj", "{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39} = {C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9A152C52-C5EE-41ED-AD29-8EEE5D41E372}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime", "src\System.Dynamic.Runtime.csproj", "{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4E604291-4118-4CD6-B790-BA5F4F8C1A18} = {4E604291-4118-4CD6-B790-BA5F4F8C1A18}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9E4EA321-CED7-4A2B-BA35-468EDF0EF007}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime", "ref\System.Dynamic.Runtime.csproj", "{4E604291-4118-4CD6-B790-BA5F4F8C1A18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime", "ref\System.Dynamic.Runtime.csproj", "{1A6D5602-176D-4E7D-A7F5-F4D25044E171}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime", "src\System.Dynamic.Runtime.csproj", "{F4EF8420-0243-452F-879E-609F9AE7C05E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Dynamic.Runtime.Tests", "tests\System.Dynamic.Runtime.Tests.csproj", "{3695B814-610C-41D5-A3F5-B0B55EF10863}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6AD793CF-2805-4101-975C-71CE64DB62A1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D95AE371-BDD6-43CD-BA59-DE0EE0813E01}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3653D393-7F7B-4090-90FA-7028C29B5FFC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{84102ABB-EE96-4D46-96B8-16759AE17E13}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{678436AA-0958-4152-8964-886B7B64CBD0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3E843338-D01C-4AA5-ABD5-099896E60067}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{85532E0A-0329-4D58-80FE-F1B8E295D492}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7996B20A-5EAA-4054-80DE-BBC21F6CD1B5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{9A152C52-C5EE-41ED-AD29-8EEE5D41E372} = {3E843338-D01C-4AA5-ABD5-099896E60067}
+		{3695B814-610C-41D5-A3F5-B0B55EF10863} = {3E843338-D01C-4AA5-ABD5-099896E60067}
+		{9E4EA321-CED7-4A2B-BA35-468EDF0EF007} = {85532E0A-0329-4D58-80FE-F1B8E295D492}
+		{1A6D5602-176D-4E7D-A7F5-F4D25044E171} = {85532E0A-0329-4D58-80FE-F1B8E295D492}
+		{6AD793CF-2805-4101-975C-71CE64DB62A1} = {85532E0A-0329-4D58-80FE-F1B8E295D492}
+		{84102ABB-EE96-4D46-96B8-16759AE17E13} = {85532E0A-0329-4D58-80FE-F1B8E295D492}
+		{678436AA-0958-4152-8964-886B7B64CBD0} = {85532E0A-0329-4D58-80FE-F1B8E295D492}
+		{F4EF8420-0243-452F-879E-609F9AE7C05E} = {7996B20A-5EAA-4054-80DE-BBC21F6CD1B5}
+		{3653D393-7F7B-4090-90FA-7028C29B5FFC} = {7996B20A-5EAA-4054-80DE-BBC21F6CD1B5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E604291-4118-4CD6-B790-BA5F4F8C1A18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D95AE371-BDD6-43CD-BA59-DE0EE0813E01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D95AE371-BDD6-43CD-BA59-DE0EE0813E01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D95AE371-BDD6-43CD-BA59-DE0EE0813E01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D95AE371-BDD6-43CD-BA59-DE0EE0813E01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A152C52-C5EE-41ED-AD29-8EEE5D41E372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A152C52-C5EE-41ED-AD29-8EEE5D41E372}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A152C52-C5EE-41ED-AD29-8EEE5D41E372}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A152C52-C5EE-41ED-AD29-8EEE5D41E372}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E4EA321-CED7-4A2B-BA35-468EDF0EF007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E4EA321-CED7-4A2B-BA35-468EDF0EF007}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E4EA321-CED7-4A2B-BA35-468EDF0EF007}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E4EA321-CED7-4A2B-BA35-468EDF0EF007}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A6D5602-176D-4E7D-A7F5-F4D25044E171}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A6D5602-176D-4E7D-A7F5-F4D25044E171}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A6D5602-176D-4E7D-A7F5-F4D25044E171}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A6D5602-176D-4E7D-A7F5-F4D25044E171}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4EF8420-0243-452F-879E-609F9AE7C05E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4EF8420-0243-452F-879E-609F9AE7C05E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4EF8420-0243-452F-879E-609F9AE7C05E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4EF8420-0243-452F-879E-609F9AE7C05E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3695B814-610C-41D5-A3F5-B0B55EF10863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3695B814-610C-41D5-A3F5-B0B55EF10863}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3695B814-610C-41D5-A3F5-B0B55EF10863}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3695B814-610C-41D5-A3F5-B0B55EF10863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AD793CF-2805-4101-975C-71CE64DB62A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AD793CF-2805-4101-975C-71CE64DB62A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AD793CF-2805-4101-975C-71CE64DB62A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AD793CF-2805-4101-975C-71CE64DB62A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3653D393-7F7B-4090-90FA-7028C29B5FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3653D393-7F7B-4090-90FA-7028C29B5FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3653D393-7F7B-4090-90FA-7028C29B5FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3653D393-7F7B-4090-90FA-7028C29B5FFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84102ABB-EE96-4D46-96B8-16759AE17E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84102ABB-EE96-4D46-96B8-16759AE17E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84102ABB-EE96-4D46-96B8-16759AE17E13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84102ABB-EE96-4D46-96B8-16759AE17E13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{678436AA-0958-4152-8964-886B7B64CBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{678436AA-0958-4152-8964-886B7B64CBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{678436AA-0958-4152-8964-886B7B64CBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{678436AA-0958-4152-8964-886B7B64CBD0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0BFD6D9F-DF9E-4B17-8ED4-29437AE5B04A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C4E89B8C-07DB-40CA-8C99-82A23E8F5F39} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4E604291-4118-4CD6-B790-BA5F4F8C1A18} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{D95AE371-BDD6-43CD-BA59-DE0EE0813E01} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C0D76504-56B2-45C0-9822-E933DE54D878}
+		SolutionGuid = {48F54059-7B38-4CA3-A572-D20E5AD37696}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
index dfd2a9e9ae1be2..8f49dd9d3e4707 100644
--- a/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
+++ b/src/libraries/System.Formats.Asn1/System.Formats.Asn1.sln
@@ -1,53 +1,100 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1.Tests", "tests\System.Formats.Asn1.Tests.csproj", "{8E5CC092-64B6-40BD-B422-3072EBDA79C0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E1F62374-FC25-4C34-8399-887A0F785F69} = {E1F62374-FC25-4C34-8399-887A0F785F69}
-	EndProjectSection
+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.Formats.Asn1", "src\System.Formats.Asn1.csproj", "{E1F62374-FC25-4C34-8399-887A0F785F69}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6CE58FC1-0579-4E54-A815-774942CA1E6F} = {6CE58FC1-0579-4E54-A815-774942CA1E6F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{38CB62AF-FD52-433E-AB63-CB07BA1D2CD8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "ref\System.Formats.Asn1.csproj", "{6CE58FC1-0579-4E54-A815-774942CA1E6F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2E2E9476-9161-47DF-A34A-FBDB066D0EE7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "ref\System.Formats.Asn1.csproj", "{1548AC5C-27FD-4B46-A930-C168D622FAB0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8C13471F-2F38-4AFE-802C-78074B8670E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "src\System.Formats.Asn1.csproj", "{A078A4EB-27E8-42B1-BD44-3807732A4560}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7F15ECA1-2FD6-4EF7-A554-31197519A1F2}"
+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\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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A7AD2290-A979-4139-9C71-BBCD5594180D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{3A873063-B154-4186-914D-1F4F3236101E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3A73868D-BC2F-483A-B51B-0F3C862BBE85}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3F027944-9702-4DA5-A7E2-042D5037ABD3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BC246661-9887-4096-BF1A-AC25060547B2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F94DE827-A426-45CB-AE6E-4E1C154B5386} = {3A73868D-BC2F-483A-B51B-0F3C862BBE85}
+		{2E6DAC1B-9054-40AF-AF72-4C2DD7BD9294} = {3A73868D-BC2F-483A-B51B-0F3C862BBE85}
+		{38CB62AF-FD52-433E-AB63-CB07BA1D2CD8} = {3F027944-9702-4DA5-A7E2-042D5037ABD3}
+		{1548AC5C-27FD-4B46-A930-C168D622FAB0} = {3F027944-9702-4DA5-A7E2-042D5037ABD3}
+		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9} = {3F027944-9702-4DA5-A7E2-042D5037ABD3}
+		{A7AD2290-A979-4139-9C71-BBCD5594180D} = {3F027944-9702-4DA5-A7E2-042D5037ABD3}
+		{3A873063-B154-4186-914D-1F4F3236101E} = {3F027944-9702-4DA5-A7E2-042D5037ABD3}
+		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22} = {BC246661-9887-4096-BF1A-AC25060547B2}
+		{A078A4EB-27E8-42B1-BD44-3807732A4560} = {BC246661-9887-4096-BF1A-AC25060547B2}
+		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F} = {BC246661-9887-4096-BF1A-AC25060547B2}
+		{E5280823-9A9A-4314-B0C3-B983A7D50C85} = {BC246661-9887-4096-BF1A-AC25060547B2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8E5CC092-64B6-40BD-B422-3072EBDA79C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E5CC092-64B6-40BD-B422-3072EBDA79C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E5CC092-64B6-40BD-B422-3072EBDA79C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E5CC092-64B6-40BD-B422-3072EBDA79C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1F62374-FC25-4C34-8399-887A0F785F69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1F62374-FC25-4C34-8399-887A0F785F69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1F62374-FC25-4C34-8399-887A0F785F69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1F62374-FC25-4C34-8399-887A0F785F69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CE58FC1-0579-4E54-A815-774942CA1E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CE58FC1-0579-4E54-A815-774942CA1E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CE58FC1-0579-4E54-A815-774942CA1E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CE58FC1-0579-4E54-A815-774942CA1E6F}.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
+		{F94DE827-A426-45CB-AE6E-4E1C154B5386}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38CB62AF-FD52-433E-AB63-CB07BA1D2CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38CB62AF-FD52-433E-AB63-CB07BA1D2CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38CB62AF-FD52-433E-AB63-CB07BA1D2CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38CB62AF-FD52-433E-AB63-CB07BA1D2CD8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B51B75BA-A1AF-42FB-9845-E9AAC42CFB22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{1548AC5C-27FD-4B46-A930-C168D622FAB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E49FF32-6CC1-42B0-AF30-25098C7DA18F}.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
+		{696A5E1C-B7B4-4EA0-AE2A-3FDA1C50F4D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5280823-9A9A-4314-B0C3-B983A7D50C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{A7AD2290-A979-4139-9C71-BBCD5594180D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7AD2290-A979-4139-9C71-BBCD5594180D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7AD2290-A979-4139-9C71-BBCD5594180D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7AD2290-A979-4139-9C71-BBCD5594180D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A873063-B154-4186-914D-1F4F3236101E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A873063-B154-4186-914D-1F4F3236101E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A873063-B154-4186-914D-1F4F3236101E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A873063-B154-4186-914D-1F4F3236101E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8E5CC092-64B6-40BD-B422-3072EBDA79C0} = {2E2E9476-9161-47DF-A34A-FBDB066D0EE7}
-		{E1F62374-FC25-4C34-8399-887A0F785F69} = {8C13471F-2F38-4AFE-802C-78074B8670E5}
-		{6CE58FC1-0579-4E54-A815-774942CA1E6F} = {7F15ECA1-2FD6-4EF7-A554-31197519A1F2}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6EB2470F-A46B-4E53-953C-470334FA8541}
+		SolutionGuid = {4DF081FC-DC0D-4317-AB2C-4294B9FE6257}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
index 31f26813ae83a3..716bbc03ad0372 100644
--- a/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
+++ b/src/libraries/System.Formats.Cbor/System.Formats.Cbor.sln
@@ -1,54 +1,93 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30215.9
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "src\System.Formats.Cbor.csproj", "{57B5AD1E-D0BA-4811-9276-9BBAFF44AB31}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5D669352-A281-4262-8BDE-1EA9D3A59C17}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{00675670-C8E7-4428-A16F-9E6B933586A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{22F3D655-C0B3-4E4D-A318-5ACC42A30DB8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{59B37ECC-D5BB-488A-9571-1E239EDF19A9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "ref\System.Formats.Cbor.csproj", "{259A1DB6-EF7E-4D45-96EF-035E0605BB55}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B3417D0B-D64E-4CC8-AEAA-F0C7C963248F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "src\System.Formats.Cbor.csproj", "{8D8A522D-D363-4594-81BF-0EB16C0B4713}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor", "ref\System.Formats.Cbor.csproj", "{B17130D2-0A75-464A-A3E7-67123C567CAF}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "System.Formats.Cbor.Tests.DataModel", "tests\CborDocument\System.Formats.Cbor.Tests.DataModel.fsproj", "{EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor.Tests", "tests\System.Formats.Cbor.Tests.csproj", "{1C84C43C-69A8-493E-AC11-0DA9C22BFB46}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Cbor.Tests", "tests\System.Formats.Cbor.Tests.csproj", "{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "System.Formats.Cbor.Tests.DataModel", "tests\CborDocument\System.Formats.Cbor.Tests.DataModel.fsproj", "{3BF538B4-0985-4918-90A7-8F15BA9E661C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D4AA9244-4CC5-4841-8E7A-63EA10E0135E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D08E0206-F6F0-4777-9865-8A1261393B30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{70B08CA7-4086-4F3B-903C-91F3E302DAE2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{279CA132-6793-4DB0-97C7-E6ED546F471C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{20353D61-0DE5-4640-976E-84E162C2E767}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97527DDF-CC6B-45D1-A97B-6AB9EBC29029}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5D669352-A281-4262-8BDE-1EA9D3A59C17} = {279CA132-6793-4DB0-97C7-E6ED546F471C}
+		{EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E} = {279CA132-6793-4DB0-97C7-E6ED546F471C}
+		{29879823-0A6F-44A0-B0A5-D90DEC23E4EF} = {279CA132-6793-4DB0-97C7-E6ED546F471C}
+		{22F3D655-C0B3-4E4D-A318-5ACC42A30DB8} = {20353D61-0DE5-4640-976E-84E162C2E767}
+		{259A1DB6-EF7E-4D45-96EF-035E0605BB55} = {20353D61-0DE5-4640-976E-84E162C2E767}
+		{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4} = {20353D61-0DE5-4640-976E-84E162C2E767}
+		{D08E0206-F6F0-4777-9865-8A1261393B30} = {20353D61-0DE5-4640-976E-84E162C2E767}
+		{70B08CA7-4086-4F3B-903C-91F3E302DAE2} = {20353D61-0DE5-4640-976E-84E162C2E767}
+		{8D8A522D-D363-4594-81BF-0EB16C0B4713} = {97527DDF-CC6B-45D1-A97B-6AB9EBC29029}
+		{D4AA9244-4CC5-4841-8E7A-63EA10E0135E} = {97527DDF-CC6B-45D1-A97B-6AB9EBC29029}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{57B5AD1E-D0BA-4811-9276-9BBAFF44AB31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57B5AD1E-D0BA-4811-9276-9BBAFF44AB31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57B5AD1E-D0BA-4811-9276-9BBAFF44AB31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57B5AD1E-D0BA-4811-9276-9BBAFF44AB31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B17130D2-0A75-464A-A3E7-67123C567CAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B17130D2-0A75-464A-A3E7-67123C567CAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B17130D2-0A75-464A-A3E7-67123C567CAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B17130D2-0A75-464A-A3E7-67123C567CAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C84C43C-69A8-493E-AC11-0DA9C22BFB46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C84C43C-69A8-493E-AC11-0DA9C22BFB46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C84C43C-69A8-493E-AC11-0DA9C22BFB46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C84C43C-69A8-493E-AC11-0DA9C22BFB46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BF538B4-0985-4918-90A7-8F15BA9E661C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BF538B4-0985-4918-90A7-8F15BA9E661C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BF538B4-0985-4918-90A7-8F15BA9E661C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BF538B4-0985-4918-90A7-8F15BA9E661C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D669352-A281-4262-8BDE-1EA9D3A59C17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D669352-A281-4262-8BDE-1EA9D3A59C17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D669352-A281-4262-8BDE-1EA9D3A59C17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D669352-A281-4262-8BDE-1EA9D3A59C17}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22F3D655-C0B3-4E4D-A318-5ACC42A30DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22F3D655-C0B3-4E4D-A318-5ACC42A30DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22F3D655-C0B3-4E4D-A318-5ACC42A30DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22F3D655-C0B3-4E4D-A318-5ACC42A30DB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{259A1DB6-EF7E-4D45-96EF-035E0605BB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{259A1DB6-EF7E-4D45-96EF-035E0605BB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{259A1DB6-EF7E-4D45-96EF-035E0605BB55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{259A1DB6-EF7E-4D45-96EF-035E0605BB55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D8A522D-D363-4594-81BF-0EB16C0B4713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D8A522D-D363-4594-81BF-0EB16C0B4713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D8A522D-D363-4594-81BF-0EB16C0B4713}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D8A522D-D363-4594-81BF-0EB16C0B4713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EBE45DA7-3D32-4F35-AB59-1A97FE0C2C7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29879823-0A6F-44A0-B0A5-D90DEC23E4EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1CCB0AF8-2999-45DD-A1B2-48C33B8EEFC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4AA9244-4CC5-4841-8E7A-63EA10E0135E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D08E0206-F6F0-4777-9865-8A1261393B30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D08E0206-F6F0-4777-9865-8A1261393B30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D08E0206-F6F0-4777-9865-8A1261393B30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D08E0206-F6F0-4777-9865-8A1261393B30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70B08CA7-4086-4F3B-903C-91F3E302DAE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70B08CA7-4086-4F3B-903C-91F3E302DAE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70B08CA7-4086-4F3B-903C-91F3E302DAE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70B08CA7-4086-4F3B-903C-91F3E302DAE2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{57B5AD1E-D0BA-4811-9276-9BBAFF44AB31} = {59B37ECC-D5BB-488A-9571-1E239EDF19A9}
-		{B17130D2-0A75-464A-A3E7-67123C567CAF} = {B3417D0B-D64E-4CC8-AEAA-F0C7C963248F}
-		{1C84C43C-69A8-493E-AC11-0DA9C22BFB46} = {00675670-C8E7-4428-A16F-9E6B933586A8}
-		{3BF538B4-0985-4918-90A7-8F15BA9E661C} = {00675670-C8E7-4428-A16F-9E6B933586A8}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {36EE2FB8-4CD8-4A12-8FD5-9FDF3D0F6D40}
+		SolutionGuid = {5D247ED0-3E73-46A6-ACC7-523BA1493370}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
index 28cc95021abceb..14313ef439a125 100644
--- a/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
+++ b/src/libraries/System.Globalization.Calendars/System.Globalization.Calendars.sln
@@ -1,70 +1,231 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars.Tests", "tests\System.Globalization.Calendars.Tests.csproj", "{66BE33BB-790D-4D0C-9336-E073001CBD15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E} = {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.CalendarsWithConfigSwitch.Tests", "tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj", "{77BE33BB-790D-4D0C-9336-E073001CBD15}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E} = {7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{32F01C47-D495-45CE-9567-E4C434F7D627}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars", "src\System.Globalization.Calendars.csproj", "{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647} = {2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{37AA16BB-DE68-4735-AA1C-733038E40127}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars", "ref\System.Globalization.Calendars.csproj", "{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars", "ref\System.Globalization.Calendars.csproj", "{6553EF4A-C352-4034-835A-7679E589B5A6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars", "src\System.Globalization.Calendars.csproj", "{705D0D71-8890-4893-824F-E302CDE5349F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.CalendarsWithConfigSwitch.Tests", "tests\CalendarTestWithConfigSwitch\System.Globalization.CalendarsWithConfigSwitch.Tests.csproj", "{CD1CDCDD-64FA-4E75-A74F-16A978C56449}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Calendars.Tests", "tests\System.Globalization.Calendars.Tests.csproj", "{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{806460E6-D949-4BEF-844D-1FBDF4287758}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7AE40769-89B3-4881-96F4-0EC78CD5610E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{7B678A3B-0273-481E-9C7D-10822BC8CE30}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E761C156-60A8-4402-B890-7F448BE28211}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99455DF1-BA8D-41FC-9036-895391F9F9DB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4B1150EB-D868-4483-8EC8-D8E4FCC27669}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4E8EEE0B-670B-4040-AD3D-6854F4BA15C2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79} = {99455DF1-BA8D-41FC-9036-895391F9F9DB}
+		{705D0D71-8890-4893-824F-E302CDE5349F} = {99455DF1-BA8D-41FC-9036-895391F9F9DB}
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4} = {99455DF1-BA8D-41FC-9036-895391F9F9DB}
+		{32F01C47-D495-45CE-9567-E4C434F7D627} = {4B1150EB-D868-4483-8EC8-D8E4FCC27669}
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449} = {4B1150EB-D868-4483-8EC8-D8E4FCC27669}
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706} = {4B1150EB-D868-4483-8EC8-D8E4FCC27669}
+		{37AA16BB-DE68-4735-AA1C-733038E40127} = {4E8EEE0B-670B-4040-AD3D-6854F4BA15C2}
+		{6553EF4A-C352-4034-835A-7679E589B5A6} = {4E8EEE0B-670B-4040-AD3D-6854F4BA15C2}
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E} = {4E8EEE0B-670B-4040-AD3D-6854F4BA15C2}
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30} = {4E8EEE0B-670B-4040-AD3D-6854F4BA15C2}
+		{E761C156-60A8-4402-B890-7F448BE28211} = {4E8EEE0B-670B-4040-AD3D-6854F4BA15C2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77BE33BB-790D-4D0C-9336-E073001CBD15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77BE33BB-790D-4D0C-9336-E073001CBD15}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647}.Release|Any CPU.Build.0 = Release|Any CPU
-		{806460E6-D949-4BEF-844D-1FBDF4287758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{806460E6-D949-4BEF-844D-1FBDF4287758}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{806460E6-D949-4BEF-844D-1FBDF4287758}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{806460E6-D949-4BEF-844D-1FBDF4287758}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|Any CPU.Build.0 = Debug|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|x64.ActiveCfg = Debug|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|x64.Build.0 = Debug|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|x86.ActiveCfg = Debug|x86
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Debug|x86.Build.0 = Debug|x86
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|Any CPU.ActiveCfg = Release|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|Any CPU.Build.0 = Release|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x64.ActiveCfg = Release|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x64.Build.0 = Release|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x86.ActiveCfg = Release|x86
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Release|x86.Build.0 = Release|x86
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|Any CPU.Build.0 = Checked|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.ActiveCfg = Checked|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x64.Build.0 = Checked|x64
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.ActiveCfg = Checked|x86
+		{E70B35E3-B6C3-4196-9FAB-1A0D45748E79}.Checked|x86.Build.0 = Checked|x86
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|x64.Build.0 = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Debug|x86.Build.0 = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x64.ActiveCfg = Release|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x64.Build.0 = Release|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x86.ActiveCfg = Release|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Release|x86.Build.0 = Release|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{32F01C47-D495-45CE-9567-E4C434F7D627}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Debug|x64.Build.0 = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Debug|x86.Build.0 = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Release|x64.ActiveCfg = Release|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Release|x64.Build.0 = Release|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Release|x86.ActiveCfg = Release|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Release|x86.Build.0 = Release|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{37AA16BB-DE68-4735-AA1C-733038E40127}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|x64.Build.0 = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Debug|x86.Build.0 = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x64.ActiveCfg = Release|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x64.Build.0 = Release|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x86.ActiveCfg = Release|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Release|x86.Build.0 = Release|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6553EF4A-C352-4034-835A-7679E589B5A6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Debug|x64.Build.0 = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Debug|x86.Build.0 = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Release|x64.ActiveCfg = Release|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Release|x64.Build.0 = Release|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Release|x86.ActiveCfg = Release|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Release|x86.Build.0 = Release|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{705D0D71-8890-4893-824F-E302CDE5349F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|x64.Build.0 = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Debug|x86.Build.0 = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x64.ActiveCfg = Release|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x64.Build.0 = Release|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x86.ActiveCfg = Release|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Release|x86.Build.0 = Release|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CD1CDCDD-64FA-4E75-A74F-16A978C56449}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|x64.Build.0 = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Debug|x86.Build.0 = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x64.ActiveCfg = Release|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x64.Build.0 = Release|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x86.ActiveCfg = Release|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Release|x86.Build.0 = Release|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BFEF5B19-7D03-42BA-9CD1-D1B53F35D706}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x64.Build.0 = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x64.ActiveCfg = Release|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x64.Build.0 = Release|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Release|x86.Build.0 = Release|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7AE40769-89B3-4881-96F4-0EC78CD5610E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x64.ActiveCfg = Release|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x64.Build.0 = Release|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Release|x86.Build.0 = Release|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DE8D220F-4A0B-4B79-A6AD-B20FD67CC7A4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Debug|x64.Build.0 = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Debug|x86.Build.0 = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Release|x64.ActiveCfg = Release|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Release|x64.Build.0 = Release|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Release|x86.ActiveCfg = Release|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Release|x86.Build.0 = Release|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7B678A3B-0273-481E-9C7D-10822BC8CE30}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Debug|x64.Build.0 = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Debug|x86.Build.0 = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Release|x64.ActiveCfg = Release|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Release|x64.Build.0 = Release|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Release|x86.ActiveCfg = Release|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Release|x86.Build.0 = Release|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E761C156-60A8-4402-B890-7F448BE28211}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{66BE33BB-790D-4D0C-9336-E073001CBD15} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{77BE33BB-790D-4D0C-9336-E073001CBD15} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7126BEDB-0903-454A-8A2B-8BE1CBDF8F2E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2BD6A51E-A2FE-4024-A21F-E1D7A24E7647} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{806460E6-D949-4BEF-844D-1FBDF4287758} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CDE7C5B0-CDF5-4CD4-AF93-57472C5D4554}
+		SolutionGuid = {73A91A21-729E-4C60-BCD4-389B47ED823F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
index e39e0278857fc0..bafb4a24037b04 100644
--- a/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
+++ b/src/libraries/System.Globalization.Extensions/System.Globalization.Extensions.sln
@@ -1,71 +1,93 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29923.206
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests.csproj", "{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2B96AA10-84C0-4927-8611-8D2474B990E8} = {2B96AA10-84C0-4927-8611-8D2474B990E8}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0742DF66-F5B8-40F7-9D4F-560A62FD6818}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions", "src\System.Globalization.Extensions.csproj", "{2B96AA10-84C0-4927-8611-8D2474B990E8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3634FAA3-A33E-406A-94EE-5611C6CC2810} = {3634FAA3-A33E-406A-94EE-5611C6CC2810}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{33585CCF-5FE4-47DB-90A6-76E332ED2FDF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions", "ref\System.Globalization.Extensions.csproj", "{3634FAA3-A33E-406A-94EE-5611C6CC2810}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions", "ref\System.Globalization.Extensions.csproj", "{03BF7E49-E28C-468E-8D90-E4022B608F00}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions", "src\System.Globalization.Extensions.csproj", "{DCD0404E-234C-437B-A80A-EAFD567F7602}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Nls.Tests", "tests\NlsTests\System.Globalization.Extensions.Nls.Tests.csproj", "{F95ACAD3-920D-404A-A355-38ACAEC958F8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Tests", "tests\System.Globalization.Extensions.Tests.csproj", "{E2C4269C-0009-4811-9FC0-CDC97554FBEE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Extensions.Nls.Tests", "tests\NlsTests\System.Globalization.Extensions.Nls.Tests.csproj", "{CB60359A-D0ED-474E-B395-9589F1A5656A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2B96AA10-84C0-4927-8611-8D2474B990E8} = {2B96AA10-84C0-4927-8611-8D2474B990E8}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{91D7C95D-53FD-400E-A2C3-2F47D6653A81}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1659274B-9BFC-4709-B2EF-E9F363AC13B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6591A0B4-8C78-4508-996F-1EFF7F1E1323}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D0EC30D6-C016-4476-98C4-A663D29FDDC1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{DAC419D9-D1D2-47BE-BDF0-69E715809120}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1081317A-E52D-4A0C-AB48-4DEA7F259C0E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DFB11CE9-63F7-40D0-BE77-A43E52D7C611}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FB76F547-7CF6-477F-B8D7-062B72843BE0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0742DF66-F5B8-40F7-9D4F-560A62FD6818} = {1081317A-E52D-4A0C-AB48-4DEA7F259C0E}
+		{F95ACAD3-920D-404A-A355-38ACAEC958F8} = {1081317A-E52D-4A0C-AB48-4DEA7F259C0E}
+		{E2C4269C-0009-4811-9FC0-CDC97554FBEE} = {1081317A-E52D-4A0C-AB48-4DEA7F259C0E}
+		{33585CCF-5FE4-47DB-90A6-76E332ED2FDF} = {DFB11CE9-63F7-40D0-BE77-A43E52D7C611}
+		{03BF7E49-E28C-468E-8D90-E4022B608F00} = {DFB11CE9-63F7-40D0-BE77-A43E52D7C611}
+		{91D7C95D-53FD-400E-A2C3-2F47D6653A81} = {DFB11CE9-63F7-40D0-BE77-A43E52D7C611}
+		{D0EC30D6-C016-4476-98C4-A663D29FDDC1} = {DFB11CE9-63F7-40D0-BE77-A43E52D7C611}
+		{DAC419D9-D1D2-47BE-BDF0-69E715809120} = {DFB11CE9-63F7-40D0-BE77-A43E52D7C611}
+		{DCD0404E-234C-437B-A80A-EAFD567F7602} = {FB76F547-7CF6-477F-B8D7-062B72843BE0}
+		{6591A0B4-8C78-4508-996F-1EFF7F1E1323} = {FB76F547-7CF6-477F-B8D7-062B72843BE0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B96AA10-84C0-4927-8611-8D2474B990E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B96AA10-84C0-4927-8611-8D2474B990E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B96AA10-84C0-4927-8611-8D2474B990E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B96AA10-84C0-4927-8611-8D2474B990E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3634FAA3-A33E-406A-94EE-5611C6CC2810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3634FAA3-A33E-406A-94EE-5611C6CC2810}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3634FAA3-A33E-406A-94EE-5611C6CC2810}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3634FAA3-A33E-406A-94EE-5611C6CC2810}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB60359A-D0ED-474E-B395-9589F1A5656A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB60359A-D0ED-474E-B395-9589F1A5656A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB60359A-D0ED-474E-B395-9589F1A5656A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB60359A-D0ED-474E-B395-9589F1A5656A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1659274B-9BFC-4709-B2EF-E9F363AC13B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1659274B-9BFC-4709-B2EF-E9F363AC13B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1659274B-9BFC-4709-B2EF-E9F363AC13B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1659274B-9BFC-4709-B2EF-E9F363AC13B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0742DF66-F5B8-40F7-9D4F-560A62FD6818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0742DF66-F5B8-40F7-9D4F-560A62FD6818}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0742DF66-F5B8-40F7-9D4F-560A62FD6818}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0742DF66-F5B8-40F7-9D4F-560A62FD6818}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33585CCF-5FE4-47DB-90A6-76E332ED2FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33585CCF-5FE4-47DB-90A6-76E332ED2FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33585CCF-5FE4-47DB-90A6-76E332ED2FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33585CCF-5FE4-47DB-90A6-76E332ED2FDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03BF7E49-E28C-468E-8D90-E4022B608F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03BF7E49-E28C-468E-8D90-E4022B608F00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03BF7E49-E28C-468E-8D90-E4022B608F00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03BF7E49-E28C-468E-8D90-E4022B608F00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCD0404E-234C-437B-A80A-EAFD567F7602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCD0404E-234C-437B-A80A-EAFD567F7602}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCD0404E-234C-437B-A80A-EAFD567F7602}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCD0404E-234C-437B-A80A-EAFD567F7602}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F95ACAD3-920D-404A-A355-38ACAEC958F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F95ACAD3-920D-404A-A355-38ACAEC958F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F95ACAD3-920D-404A-A355-38ACAEC958F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F95ACAD3-920D-404A-A355-38ACAEC958F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2C4269C-0009-4811-9FC0-CDC97554FBEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91D7C95D-53FD-400E-A2C3-2F47D6653A81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6591A0B4-8C78-4508-996F-1EFF7F1E1323}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0EC30D6-C016-4476-98C4-A663D29FDDC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0EC30D6-C016-4476-98C4-A663D29FDDC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0EC30D6-C016-4476-98C4-A663D29FDDC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0EC30D6-C016-4476-98C4-A663D29FDDC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAC419D9-D1D2-47BE-BDF0-69E715809120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAC419D9-D1D2-47BE-BDF0-69E715809120}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAC419D9-D1D2-47BE-BDF0-69E715809120}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAC419D9-D1D2-47BE-BDF0-69E715809120}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{BC439554-4AB4-4C94-8E28-C00EDE4FD1C7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2B96AA10-84C0-4927-8611-8D2474B990E8} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{3634FAA3-A33E-406A-94EE-5611C6CC2810} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{CB60359A-D0ED-474E-B395-9589F1A5656A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1659274B-9BFC-4709-B2EF-E9F363AC13B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3E550ED4-6053-4B16-97D1-BAADB02924FE}
+		SolutionGuid = {95832D00-16CE-46D5-8C6F-639E535B720A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln
index c4824927738b48..73c181f6928238 100644
--- a/src/libraries/System.Globalization/System.Globalization.sln
+++ b/src/libraries/System.Globalization/System.Globalization.sln
@@ -1,87 +1,267 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29923.206
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Tests", "tests\System.Globalization.Tests.csproj", "{484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Invariant.Tests", "tests\Invariant\Invariant.Tests.csproj", "{9A8926D9-1D4C-4069-8965-A626F6CA8C29}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{79613DED-481D-44EF-BB89-7AC6BD53026B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization", "src\System.Globalization.csproj", "{2395E8CA-73CB-40DF-BE40-A60BC189B737}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E1E58C98-808F-4065-9C1D-E6411166AF6F} = {E1E58C98-808F-4065-9C1D-E6411166AF6F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{40231BCB-E151-45E0-A1C4-4D559A434362}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization", "ref\System.Globalization.csproj", "{E1E58C98-808F-4065-9C1D-E6411166AF6F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7835A00A-3153-4777-8A84-B571268642D5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization", "ref\System.Globalization.csproj", "{55249BC9-201A-4418-AF14-7AC743D9A867}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization", "src\System.Globalization.csproj", "{4ABAB509-1210-43B4-B274-76B4FE02BD9B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Invariant.Tests", "tests\Invariant\Invariant.Tests.csproj", "{DD7E56B4-65B7-4822-A4E1-ECDD51524927}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Nls.Tests", "tests\NlsTests\System.Globalization.Nls.Tests.csproj", "{6B71E284-DA57-4657-9E08-A02BAFB877CC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Nls.Tests", "tests\NlsTests\System.Globalization.Nls.Tests.csproj", "{9B797657-6BBC-4240-9903-3FCE3E1FC713}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{443745F1-A200-432B-A666-3D0E9F938DED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Tests", "tests\System.Globalization.Tests.csproj", "{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{E5ECA266-C7E9-4597-8FFA-095BD6890407}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BF058293-0E5D-412C-A0B0-E55AF943278E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F17D674C-0B0A-47FB-8B81-5B8664564E23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3C3DA581-CEBE-450D-A998-BA05636BB760}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{43C13D7B-23F3-4D83-B8BB-CE743A56D697}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CB8CE378-BA3F-4121-9BDF-DDDA463E18FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19607535-C790-484E-AC4D-225538DEC717}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3C8549BD-6E88-4FBF-B073-0B5196DCF07F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB} = {CB8CE378-BA3F-4121-9BDF-DDDA463E18FD}
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B} = {CB8CE378-BA3F-4121-9BDF-DDDA463E18FD}
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23} = {CB8CE378-BA3F-4121-9BDF-DDDA463E18FD}
+		{79613DED-481D-44EF-BB89-7AC6BD53026B} = {19607535-C790-484E-AC4D-225538DEC717}
+		{40231BCB-E151-45E0-A1C4-4D559A434362} = {19607535-C790-484E-AC4D-225538DEC717}
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927} = {19607535-C790-484E-AC4D-225538DEC717}
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713} = {19607535-C790-484E-AC4D-225538DEC717}
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47} = {19607535-C790-484E-AC4D-225538DEC717}
+		{7835A00A-3153-4777-8A84-B571268642D5} = {3C8549BD-6E88-4FBF-B073-0B5196DCF07F}
+		{55249BC9-201A-4418-AF14-7AC743D9A867} = {3C8549BD-6E88-4FBF-B073-0B5196DCF07F}
+		{BF058293-0E5D-412C-A0B0-E55AF943278E} = {3C8549BD-6E88-4FBF-B073-0B5196DCF07F}
+		{3C3DA581-CEBE-450D-A998-BA05636BB760} = {3C8549BD-6E88-4FBF-B073-0B5196DCF07F}
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697} = {3C8549BD-6E88-4FBF-B073-0B5196DCF07F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{484C92C6-6D2C-45BC-A5E2-4A12BA228E1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9A8926D9-1D4C-4069-8965-A626F6CA8C29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1E58C98-808F-4065-9C1D-E6411166AF6F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B71E284-DA57-4657-9E08-A02BAFB877CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B71E284-DA57-4657-9E08-A02BAFB877CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B71E284-DA57-4657-9E08-A02BAFB877CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B71E284-DA57-4657-9E08-A02BAFB877CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{443745F1-A200-432B-A666-3D0E9F938DED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{443745F1-A200-432B-A666-3D0E9F938DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{443745F1-A200-432B-A666-3D0E9F938DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{443745F1-A200-432B-A666-3D0E9F938DED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5ECA266-C7E9-4597-8FFA-095BD6890407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|Any CPU.Build.0 = Debug|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|x64.ActiveCfg = Debug|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|x64.Build.0 = Debug|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|x86.ActiveCfg = Debug|x86
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Debug|x86.Build.0 = Debug|x86
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|Any CPU.ActiveCfg = Release|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|Any CPU.Build.0 = Release|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x64.ActiveCfg = Release|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x64.Build.0 = Release|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x86.ActiveCfg = Release|x86
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Release|x86.Build.0 = Release|x86
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|Any CPU.Build.0 = Checked|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.ActiveCfg = Checked|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x64.Build.0 = Checked|x64
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.ActiveCfg = Checked|x86
+		{E269F8BB-F629-4C96-B9B2-03A00D8B1BFB}.Checked|x86.Build.0 = Checked|x86
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|x64.Build.0 = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Debug|x86.Build.0 = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x64.ActiveCfg = Release|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x64.Build.0 = Release|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x86.ActiveCfg = Release|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Release|x86.Build.0 = Release|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{79613DED-481D-44EF-BB89-7AC6BD53026B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|x64.Build.0 = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Debug|x86.Build.0 = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x64.ActiveCfg = Release|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x64.Build.0 = Release|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x86.ActiveCfg = Release|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Release|x86.Build.0 = Release|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{40231BCB-E151-45E0-A1C4-4D559A434362}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Debug|x64.Build.0 = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Debug|x86.Build.0 = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Release|x64.ActiveCfg = Release|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Release|x64.Build.0 = Release|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Release|x86.ActiveCfg = Release|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Release|x86.Build.0 = Release|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7835A00A-3153-4777-8A84-B571268642D5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|x64.Build.0 = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Debug|x86.Build.0 = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x64.ActiveCfg = Release|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x64.Build.0 = Release|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x86.ActiveCfg = Release|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Release|x86.Build.0 = Release|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{55249BC9-201A-4418-AF14-7AC743D9A867}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|x64.Build.0 = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Debug|x86.Build.0 = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x64.ActiveCfg = Release|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x64.Build.0 = Release|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x86.ActiveCfg = Release|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Release|x86.Build.0 = Release|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4ABAB509-1210-43B4-B274-76B4FE02BD9B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|x64.Build.0 = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Debug|x86.Build.0 = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x64.Build.0 = Release|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Release|x86.Build.0 = Release|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DD7E56B4-65B7-4822-A4E1-ECDD51524927}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|x64.Build.0 = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Debug|x86.Build.0 = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x64.ActiveCfg = Release|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x64.Build.0 = Release|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x86.ActiveCfg = Release|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Release|x86.Build.0 = Release|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9B797657-6BBC-4240-9903-3FCE3E1FC713}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|x64.Build.0 = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Debug|x86.Build.0 = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x64.ActiveCfg = Release|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x64.Build.0 = Release|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x86.ActiveCfg = Release|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Release|x86.Build.0 = Release|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A66D589C-6FEE-41EE-A7D9-C5306BF5AE47}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x64.Build.0 = Release|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Release|x86.Build.0 = Release|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BF058293-0E5D-412C-A0B0-E55AF943278E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x64.Build.0 = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Debug|x86.Build.0 = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x64.ActiveCfg = Release|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x64.Build.0 = Release|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x86.ActiveCfg = Release|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Release|x86.Build.0 = Release|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F17D674C-0B0A-47FB-8B81-5B8664564E23}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Debug|x64.Build.0 = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Debug|x86.Build.0 = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Release|x64.ActiveCfg = Release|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Release|x64.Build.0 = Release|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Release|x86.ActiveCfg = Release|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Release|x86.Build.0 = Release|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3C3DA581-CEBE-450D-A998-BA05636BB760}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Debug|x64.Build.0 = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Debug|x86.Build.0 = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Release|x64.ActiveCfg = Release|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Release|x64.Build.0 = Release|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Release|x86.ActiveCfg = Release|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Release|x86.Build.0 = Release|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{43C13D7B-23F3-4D83-B8BB-CE743A56D697}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{484C92C6-6D2C-45BC-A5E2-4A12BA228E1E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{9A8926D9-1D4C-4069-8965-A626F6CA8C29} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2395E8CA-73CB-40DF-BE40-A60BC189B737} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{E1E58C98-808F-4065-9C1D-E6411166AF6F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{6B71E284-DA57-4657-9E08-A02BAFB877CC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{443745F1-A200-432B-A666-3D0E9F938DED} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E5ECA266-C7E9-4597-8FFA-095BD6890407} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F9EC6162-389C-4439-9EB6-B357237A1812}
+		SolutionGuid = {33E0B3D0-C6E1-4B75-A025-AE012AD424F7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
index cdea0f1a15d426..d1dcdaaa635cec 100644
--- a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
+++ b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli.Tests", "tests\System.IO.Compression.Brotli.Tests.csproj", "{BC2E1649-291D-412E-9529-EDDA94FA7AD6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5C5E6836-8622-4C60-921C-F7B7286CD894}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli", "src\System.IO.Compression.Brotli.csproj", "{5471BFE8-8071-466F-838E-5ADAA779E742}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {4ADD9456-A929-4254-B8A2-16FC628ABFDA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9CEA4005-9ACB-4992-9D05-7BFD1474EE9A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli", "ref\System.IO.Compression.Brotli.csproj", "{4ADD9456-A929-4254-B8A2-16FC628ABFDA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli", "ref\System.IO.Compression.Brotli.csproj", "{7EC62394-2290-4075-AF5D-842C7A0F6325}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli", "src\System.IO.Compression.Brotli.csproj", "{C2A30FF0-54C2-461B-BF16-5DC610F54B52}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli.Tests", "tests\System.IO.Compression.Brotli.Tests.csproj", "{E62974EA-7E36-4183-8371-4C8EA02037B5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F7249150-3C16-477E-92D6-6B3C1C3B2328}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E40CF8BA-6590-498F-81E5-E4ED7B3B41E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{867C3FE6-0442-4492-9F56-955856B65177}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{93637A1B-27BE-4932-83BE-0BB8E71A1AC2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A71A1F11-B84B-4A7B-A1D0-A2A5021F7B2A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27666EAE-3F9F-4DCD-9FB9-12F5C523E849}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5C5E6836-8622-4C60-921C-F7B7286CD894} = {93637A1B-27BE-4932-83BE-0BB8E71A1AC2}
+		{E62974EA-7E36-4183-8371-4C8EA02037B5} = {93637A1B-27BE-4932-83BE-0BB8E71A1AC2}
+		{9CEA4005-9ACB-4992-9D05-7BFD1474EE9A} = {A71A1F11-B84B-4A7B-A1D0-A2A5021F7B2A}
+		{7EC62394-2290-4075-AF5D-842C7A0F6325} = {A71A1F11-B84B-4A7B-A1D0-A2A5021F7B2A}
+		{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C} = {A71A1F11-B84B-4A7B-A1D0-A2A5021F7B2A}
+		{E40CF8BA-6590-498F-81E5-E4ED7B3B41E9} = {A71A1F11-B84B-4A7B-A1D0-A2A5021F7B2A}
+		{867C3FE6-0442-4492-9F56-955856B65177} = {A71A1F11-B84B-4A7B-A1D0-A2A5021F7B2A}
+		{C2A30FF0-54C2-461B-BF16-5DC610F54B52} = {27666EAE-3F9F-4DCD-9FB9-12F5C523E849}
+		{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1} = {27666EAE-3F9F-4DCD-9FB9-12F5C523E849}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7249150-3C16-477E-92D6-6B3C1C3B2328}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7249150-3C16-477E-92D6-6B3C1C3B2328}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7249150-3C16-477E-92D6-6B3C1C3B2328}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7249150-3C16-477E-92D6-6B3C1C3B2328}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C5E6836-8622-4C60-921C-F7B7286CD894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C5E6836-8622-4C60-921C-F7B7286CD894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C5E6836-8622-4C60-921C-F7B7286CD894}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C5E6836-8622-4C60-921C-F7B7286CD894}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CEA4005-9ACB-4992-9D05-7BFD1474EE9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CEA4005-9ACB-4992-9D05-7BFD1474EE9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CEA4005-9ACB-4992-9D05-7BFD1474EE9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CEA4005-9ACB-4992-9D05-7BFD1474EE9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EC62394-2290-4075-AF5D-842C7A0F6325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EC62394-2290-4075-AF5D-842C7A0F6325}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EC62394-2290-4075-AF5D-842C7A0F6325}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EC62394-2290-4075-AF5D-842C7A0F6325}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2A30FF0-54C2-461B-BF16-5DC610F54B52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2A30FF0-54C2-461B-BF16-5DC610F54B52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2A30FF0-54C2-461B-BF16-5DC610F54B52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2A30FF0-54C2-461B-BF16-5DC610F54B52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E62974EA-7E36-4183-8371-4C8EA02037B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E62974EA-7E36-4183-8371-4C8EA02037B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E62974EA-7E36-4183-8371-4C8EA02037B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E62974EA-7E36-4183-8371-4C8EA02037B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A50E06CB-B581-46AB-B91F-4AAAA62A9F8C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AD9C0AC-E4C4-48D6-A191-67C4DA4399E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E40CF8BA-6590-498F-81E5-E4ED7B3B41E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E40CF8BA-6590-498F-81E5-E4ED7B3B41E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E40CF8BA-6590-498F-81E5-E4ED7B3B41E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E40CF8BA-6590-498F-81E5-E4ED7B3B41E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{867C3FE6-0442-4492-9F56-955856B65177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{867C3FE6-0442-4492-9F56-955856B65177}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{867C3FE6-0442-4492-9F56-955856B65177}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{867C3FE6-0442-4492-9F56-955856B65177}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5471BFE8-8071-466F-838E-5ADAA779E742} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F7249150-3C16-477E-92D6-6B3C1C3B2328} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E6964E6C-E54F-4BA8-A2C5-941226478E2C}
+		SolutionGuid = {42B626C7-CDFD-459B-86D8-239917F86516}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln b/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
index 3d4398bb2913f3..7efef353b127ab 100644
--- a/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
+++ b/src/libraries/System.IO.Compression.ZipFile/System.IO.Compression.ZipFile.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile.Tests", "tests\System.IO.Compression.ZipFile.Tests.csproj", "{775727A6-DF41-4160-A7FD-180279A653C7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ACF967ED-7FC9-435C-B2C9-306626B7B6C6} = {ACF967ED-7FC9-435C-B2C9-306626B7B6C6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0869556F-E34F-4284-B985-CB6D3B6AD954}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile", "src\System.IO.Compression.ZipFile.csproj", "{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29} = {5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7A9E3113-5E7B-4531-BC0F-FA9A65CBBF44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile", "ref\System.IO.Compression.ZipFile.csproj", "{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile", "ref\System.IO.Compression.ZipFile.csproj", "{E91931AD-977E-4608-9F40-997163322D8B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile", "src\System.IO.Compression.ZipFile.csproj", "{A3C36A2F-2586-43DF-B39C-A9D14DF8524E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.ZipFile.Tests", "tests\System.IO.Compression.ZipFile.Tests.csproj", "{D5A89FC9-7913-4F80-BA16-6587EB6140E3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{77978037-F865-4C86-9386-6ADDD2049B7B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DBD14497-E65E-45FC-99BA-DFE6641135BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BE00471F-EB95-4C7C-979B-C049244CE9D4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F676A88B-C621-4417-8BD9-695950375981}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0B6F73B8-F084-42D9-8541-6358338513A6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DEC42E9E-C53F-4ABD-8722-3A72FCDCD671}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{35F5878E-55B7-496D-83BA-CEA2C353BCE7}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0869556F-E34F-4284-B985-CB6D3B6AD954} = {0B6F73B8-F084-42D9-8541-6358338513A6}
+		{D5A89FC9-7913-4F80-BA16-6587EB6140E3} = {0B6F73B8-F084-42D9-8541-6358338513A6}
+		{7A9E3113-5E7B-4531-BC0F-FA9A65CBBF44} = {DEC42E9E-C53F-4ABD-8722-3A72FCDCD671}
+		{E91931AD-977E-4608-9F40-997163322D8B} = {DEC42E9E-C53F-4ABD-8722-3A72FCDCD671}
+		{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A} = {DEC42E9E-C53F-4ABD-8722-3A72FCDCD671}
+		{BE00471F-EB95-4C7C-979B-C049244CE9D4} = {DEC42E9E-C53F-4ABD-8722-3A72FCDCD671}
+		{F676A88B-C621-4417-8BD9-695950375981} = {DEC42E9E-C53F-4ABD-8722-3A72FCDCD671}
+		{A3C36A2F-2586-43DF-B39C-A9D14DF8524E} = {35F5878E-55B7-496D-83BA-CEA2C353BCE7}
+		{DBD14497-E65E-45FC-99BA-DFE6641135BE} = {35F5878E-55B7-496D-83BA-CEA2C353BCE7}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{775727A6-DF41-4160-A7FD-180279A653C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{775727A6-DF41-4160-A7FD-180279A653C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{775727A6-DF41-4160-A7FD-180279A653C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{775727A6-DF41-4160-A7FD-180279A653C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACF967ED-7FC9-435C-B2C9-306626B7B6C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77978037-F865-4C86-9386-6ADDD2049B7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77978037-F865-4C86-9386-6ADDD2049B7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77978037-F865-4C86-9386-6ADDD2049B7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77978037-F865-4C86-9386-6ADDD2049B7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0869556F-E34F-4284-B985-CB6D3B6AD954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0869556F-E34F-4284-B985-CB6D3B6AD954}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0869556F-E34F-4284-B985-CB6D3B6AD954}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0869556F-E34F-4284-B985-CB6D3B6AD954}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A9E3113-5E7B-4531-BC0F-FA9A65CBBF44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A9E3113-5E7B-4531-BC0F-FA9A65CBBF44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A9E3113-5E7B-4531-BC0F-FA9A65CBBF44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A9E3113-5E7B-4531-BC0F-FA9A65CBBF44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E91931AD-977E-4608-9F40-997163322D8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E91931AD-977E-4608-9F40-997163322D8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E91931AD-977E-4608-9F40-997163322D8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E91931AD-977E-4608-9F40-997163322D8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3C36A2F-2586-43DF-B39C-A9D14DF8524E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3C36A2F-2586-43DF-B39C-A9D14DF8524E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3C36A2F-2586-43DF-B39C-A9D14DF8524E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3C36A2F-2586-43DF-B39C-A9D14DF8524E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5A89FC9-7913-4F80-BA16-6587EB6140E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D260F5B-F8EC-41D2-8A30-60D6ADF0910A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBD14497-E65E-45FC-99BA-DFE6641135BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBD14497-E65E-45FC-99BA-DFE6641135BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBD14497-E65E-45FC-99BA-DFE6641135BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBD14497-E65E-45FC-99BA-DFE6641135BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE00471F-EB95-4C7C-979B-C049244CE9D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE00471F-EB95-4C7C-979B-C049244CE9D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE00471F-EB95-4C7C-979B-C049244CE9D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE00471F-EB95-4C7C-979B-C049244CE9D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F676A88B-C621-4417-8BD9-695950375981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F676A88B-C621-4417-8BD9-695950375981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F676A88B-C621-4417-8BD9-695950375981}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F676A88B-C621-4417-8BD9-695950375981}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{775727A6-DF41-4160-A7FD-180279A653C7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{ACF967ED-7FC9-435C-B2C9-306626B7B6C6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{5208B51C-53E1-425A-A6A7-D3BB6BCCCF29} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{77978037-F865-4C86-9386-6ADDD2049B7B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A63DC261-2EFF-471A-99EF-36F248AE1A81}
+		SolutionGuid = {D2E26432-A647-4E61-9A30-DE6C62BBD632}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Compression/System.IO.Compression.sln b/src/libraries/System.IO.Compression/System.IO.Compression.sln
index 74faa07108ad16..9999e3a349974d 100644
--- a/src/libraries/System.IO.Compression/System.IO.Compression.sln
+++ b/src/libraries/System.IO.Compression/System.IO.Compression.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Tests", "tests\System.IO.Compression.Tests.csproj", "{17DA7FB5-4370-4385-9A02-FFEF9F482903}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6F1E1397-7610-4E99-BA7E-895ABC8E5ACB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression", "src\System.IO.Compression.csproj", "{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43} = {7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{5EDF447E-42E9-4384-AF06-A7BFD12D0D0F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression", "ref\System.IO.Compression.csproj", "{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression", "ref\System.IO.Compression.csproj", "{9BFD204A-0DB1-466A-9704-0E869AC8940F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression", "src\System.IO.Compression.csproj", "{ED776381-E13D-4A0B-ACB4-74C5A784BD25}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Tests", "tests\System.IO.Compression.Tests.csproj", "{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3388FA37-5837-4B1C-9F33-4E59383A6F6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{65C7FDC3-D18B-4888-88C1-EA22B9247831}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{407EEA45-431F-41AE-ADA6-8BB884362FDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{46C60A4C-CDC0-427B-A715-D59B61205DE4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{69E74A56-9117-4A54-B2D5-921A159CADC0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8BE61DEF-44B4-463A-AA96-09242F580354}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E4CFDEF8-D456-4288-8207-5605B90C3763}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{6F1E1397-7610-4E99-BA7E-895ABC8E5ACB} = {69E74A56-9117-4A54-B2D5-921A159CADC0}
+		{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A} = {69E74A56-9117-4A54-B2D5-921A159CADC0}
+		{5EDF447E-42E9-4384-AF06-A7BFD12D0D0F} = {8BE61DEF-44B4-463A-AA96-09242F580354}
+		{9BFD204A-0DB1-466A-9704-0E869AC8940F} = {8BE61DEF-44B4-463A-AA96-09242F580354}
+		{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7} = {8BE61DEF-44B4-463A-AA96-09242F580354}
+		{407EEA45-431F-41AE-ADA6-8BB884362FDC} = {8BE61DEF-44B4-463A-AA96-09242F580354}
+		{46C60A4C-CDC0-427B-A715-D59B61205DE4} = {8BE61DEF-44B4-463A-AA96-09242F580354}
+		{ED776381-E13D-4A0B-ACB4-74C5A784BD25} = {E4CFDEF8-D456-4288-8207-5605B90C3763}
+		{65C7FDC3-D18B-4888-88C1-EA22B9247831} = {E4CFDEF8-D456-4288-8207-5605B90C3763}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17DA7FB5-4370-4385-9A02-FFEF9F482903}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17DA7FB5-4370-4385-9A02-FFEF9F482903}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3388FA37-5837-4B1C-9F33-4E59383A6F6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3388FA37-5837-4B1C-9F33-4E59383A6F6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3388FA37-5837-4B1C-9F33-4E59383A6F6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3388FA37-5837-4B1C-9F33-4E59383A6F6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F1E1397-7610-4E99-BA7E-895ABC8E5ACB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F1E1397-7610-4E99-BA7E-895ABC8E5ACB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F1E1397-7610-4E99-BA7E-895ABC8E5ACB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F1E1397-7610-4E99-BA7E-895ABC8E5ACB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EDF447E-42E9-4384-AF06-A7BFD12D0D0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5EDF447E-42E9-4384-AF06-A7BFD12D0D0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EDF447E-42E9-4384-AF06-A7BFD12D0D0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5EDF447E-42E9-4384-AF06-A7BFD12D0D0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9BFD204A-0DB1-466A-9704-0E869AC8940F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9BFD204A-0DB1-466A-9704-0E869AC8940F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9BFD204A-0DB1-466A-9704-0E869AC8940F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9BFD204A-0DB1-466A-9704-0E869AC8940F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED776381-E13D-4A0B-ACB4-74C5A784BD25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED776381-E13D-4A0B-ACB4-74C5A784BD25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED776381-E13D-4A0B-ACB4-74C5A784BD25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED776381-E13D-4A0B-ACB4-74C5A784BD25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDD2055F-5FB6-41CD-ABE8-6FB45F6CF44A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD3E0A9D-1E3D-4E5A-A095-AB33B234AFE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65C7FDC3-D18B-4888-88C1-EA22B9247831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65C7FDC3-D18B-4888-88C1-EA22B9247831}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65C7FDC3-D18B-4888-88C1-EA22B9247831}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65C7FDC3-D18B-4888-88C1-EA22B9247831}.Release|Any CPU.Build.0 = Release|Any CPU
+		{407EEA45-431F-41AE-ADA6-8BB884362FDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{407EEA45-431F-41AE-ADA6-8BB884362FDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{407EEA45-431F-41AE-ADA6-8BB884362FDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{407EEA45-431F-41AE-ADA6-8BB884362FDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46C60A4C-CDC0-427B-A715-D59B61205DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46C60A4C-CDC0-427B-A715-D59B61205DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46C60A4C-CDC0-427B-A715-D59B61205DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46C60A4C-CDC0-427B-A715-D59B61205DE4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{17DA7FB5-4370-4385-9A02-FFEF9F482903} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7CBACE0E-E07C-4ADB-A413-ADEC0CACBD43} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3388FA37-5837-4B1C-9F33-4E59383A6F6B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FE996C3E-6010-4AF1-93E1-B5311EDD5FA0}
+		SolutionGuid = {0F6F5B24-5CE5-45F2-9169-FEBEF2A3FE80}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
index 1674afd16509cb..0982a373b5cef5 100644
--- a/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
+++ b/src/libraries/System.IO.FileSystem.AccessControl/System.IO.FileSystem.AccessControl.sln
@@ -1,60 +1,149 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29420.8
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl.Tests", "tests\System.IO.FileSystem.AccessControl.Tests.csproj", "{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D77FBA6C-1AA6-45A4-93E2-97A370672C53} = {D77FBA6C-1AA6-45A4-93E2-97A370672C53}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{18FD488A-2A3F-4B40-B65D-7108688D350F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "src\System.IO.FileSystem.AccessControl.csproj", "{D77FBA6C-1AA6-45A4-93E2-97A370672C53}"
-	ProjectSection(ProjectDependencies) = postProject
-		{88A04AB0-F61E-4DD2-9E12-928DCA261263} = {88A04AB0-F61E-4DD2-9E12-928DCA261263}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{BC0B86CC-54C1-450F-A710-13A66571EEBE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "ref\System.IO.FileSystem.AccessControl.csproj", "{88A04AB0-F61E-4DD2-9E12-928DCA261263}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{071FC282-9840-4920-B0FD-BE778449B5FF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{4EF591E4-175E-494D-8191-15C2D6C6E2E6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{C0B560B2-72A0-41B2-82D5-34EF31719AD7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "ref\System.IO.FileSystem.AccessControl.csproj", "{D7E6A261-C80A-4E51-BCDD-85DD595866B9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D8ADD095-F93D-4E76-92A8-6A7C698CBFE6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "src\System.IO.FileSystem.AccessControl.csproj", "{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl.Tests", "tests\System.IO.FileSystem.AccessControl.Tests.csproj", "{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3709D2F4-5495-447A-81D1-D022B5A22DF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1AC0BFF9-2F4E-4E6A-8A5A-89DFF3AE2C74}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{37F8ED93-FD45-4941-B83E-84D278B8EA83}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EAAF9D04-EB06-48C5-B678-662C777FBC7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{F33F1171-273A-4BC3-B138-25E5E7118186}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4C78F34A-DAF6-4298-A4D3-5C8FD380E33B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{18FD488A-2A3F-4B40-B65D-7108688D350F} = {4C78F34A-DAF6-4298-A4D3-5C8FD380E33B}
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2} = {4C78F34A-DAF6-4298-A4D3-5C8FD380E33B}
+		{BC0B86CC-54C1-450F-A710-13A66571EEBE} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{071FC282-9840-4920-B0FD-BE778449B5FF} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{C0B560B2-72A0-41B2-82D5-34EF31719AD7} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{3709D2F4-5495-447A-81D1-D022B5A22DF9} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{1AC0BFF9-2F4E-4E6A-8A5A-89DFF3AE2C74} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{EAAF9D04-EB06-48C5-B678-662C777FBC7D} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{F33F1171-273A-4BC3-B138-25E5E7118186} = {A9FD5D03-1516-47D5-8CF4-FD9512E8CADB}
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+		{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+		{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+		{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA} = {2A945EB8-D29E-4FFA-A3AA-AF2D5EDAF6B1}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5915DD11-5D57-45A9-BFB0-56FEB7741E1F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D77FBA6C-1AA6-45A4-93E2-97A370672C53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{88A04AB0-F61E-4DD2-9E12-928DCA261263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{88A04AB0-F61E-4DD2-9E12-928DCA261263}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{88A04AB0-F61E-4DD2-9E12-928DCA261263}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{88A04AB0-F61E-4DD2-9E12-928DCA261263}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8ADD095-F93D-4E76-92A8-6A7C698CBFE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8ADD095-F93D-4E76-92A8-6A7C698CBFE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8ADD095-F93D-4E76-92A8-6A7C698CBFE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8ADD095-F93D-4E76-92A8-6A7C698CBFE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18FD488A-2A3F-4B40-B65D-7108688D350F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC0B86CC-54C1-450F-A710-13A66571EEBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC0B86CC-54C1-450F-A710-13A66571EEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC0B86CC-54C1-450F-A710-13A66571EEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC0B86CC-54C1-450F-A710-13A66571EEBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{071FC282-9840-4920-B0FD-BE778449B5FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EF591E4-175E-494D-8191-15C2D6C6E2E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C0B560B2-72A0-41B2-82D5-34EF31719AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0B560B2-72A0-41B2-82D5-34EF31719AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0B560B2-72A0-41B2-82D5-34EF31719AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0B560B2-72A0-41B2-82D5-34EF31719AD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7E6A261-C80A-4E51-BCDD-85DD595866B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35D57A83-8A9D-4531-BF0D-EA1BCA62D475}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EB99AA1-EE31-41AC-B3E6-DCD7A01F17F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3709D2F4-5495-447A-81D1-D022B5A22DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3709D2F4-5495-447A-81D1-D022B5A22DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3709D2F4-5495-447A-81D1-D022B5A22DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3709D2F4-5495-447A-81D1-D022B5A22DF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EB6C67A-FD15-48A6-A608-F7E27DA8DB7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AC0BFF9-2F4E-4E6A-8A5A-89DFF3AE2C74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AC0BFF9-2F4E-4E6A-8A5A-89DFF3AE2C74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AC0BFF9-2F4E-4E6A-8A5A-89DFF3AE2C74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AC0BFF9-2F4E-4E6A-8A5A-89DFF3AE2C74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{62B4CB1C-16EE-4B2F-9FF1-DF2770A056F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37F8ED93-FD45-4941-B83E-84D278B8EA83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87E03C4D-FFE2-43AD-9CFE-BB67A2448186}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAAF9D04-EB06-48C5-B678-662C777FBC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAAF9D04-EB06-48C5-B678-662C777FBC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAAF9D04-EB06-48C5-B678-662C777FBC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAAF9D04-EB06-48C5-B678-662C777FBC7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C5EE1EB-EACF-4A3A-88EC-CA7B3B7D50BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F33F1171-273A-4BC3-B138-25E5E7118186}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83F2D6C4-C3C7-4428-A0CA-577162C5DBCA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5915DD11-5D57-45A9-BFB0-56FEB7741E1F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D77FBA6C-1AA6-45A4-93E2-97A370672C53} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{88A04AB0-F61E-4DD2-9E12-928DCA261263} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{D8ADD095-F93D-4E76-92A8-6A7C698CBFE6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {3A81CF9A-55BF-49C5-9B56-1ECA910D49BB}
+		SolutionGuid = {246C2EDA-448E-4E76-B97A-BD93DC6883A7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln b/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
index 4e1ef312c0814b..ae222f7b4ed568 100644
--- a/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
+++ b/src/libraries/System.IO.FileSystem.DriveInfo/System.IO.FileSystem.DriveInfo.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo.Tests", "tests\System.IO.FileSystem.DriveInfo.Tests.csproj", "{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}"
-	ProjectSection(ProjectDependencies) = postProject
-		{29C14AD7-DC03-45DC-897D-8DACC762707E} = {29C14AD7-DC03-45DC-897D-8DACC762707E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{414D74F9-9783-4B1D-9F14-4B2F873D16F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo", "src\System.IO.FileSystem.DriveInfo.csproj", "{29C14AD7-DC03-45DC-897D-8DACC762707E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{48CD5889-4CB2-42C2-A61C-8ECA3B267584} = {48CD5889-4CB2-42C2-A61C-8ECA3B267584}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3972DF32-E184-47A8-ACEB-BE363237B00E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo", "ref\System.IO.FileSystem.DriveInfo.csproj", "{48CD5889-4CB2-42C2-A61C-8ECA3B267584}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo", "ref\System.IO.FileSystem.DriveInfo.csproj", "{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo", "src\System.IO.FileSystem.DriveInfo.csproj", "{03A51C60-B41B-409B-97AA-4084042C78D7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.DriveInfo.Tests", "tests\System.IO.FileSystem.DriveInfo.Tests.csproj", "{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A0FB000A-C607-4CBB-9223-A5FCA85DF23F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{EBD959DC-A03A-4B65-ADDE-0963075AE1EA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E50759EE-662D-451E-95E9-0C2AE947ADDF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{FB10F6C2-3022-4BB6-A219-9C2730C9AD28}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EAF86847-0AC0-4BAC-875E-E2D9CFA8760C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{642A8704-8500-4900-8F4C-42E37AF892B9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1728C929-9945-4AC8-98B6-5D8C0B28A7A3}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{414D74F9-9783-4B1D-9F14-4B2F873D16F3} = {EAF86847-0AC0-4BAC-875E-E2D9CFA8760C}
+		{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41} = {EAF86847-0AC0-4BAC-875E-E2D9CFA8760C}
+		{3972DF32-E184-47A8-ACEB-BE363237B00E} = {642A8704-8500-4900-8F4C-42E37AF892B9}
+		{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58} = {642A8704-8500-4900-8F4C-42E37AF892B9}
+		{A0FB000A-C607-4CBB-9223-A5FCA85DF23F} = {642A8704-8500-4900-8F4C-42E37AF892B9}
+		{E50759EE-662D-451E-95E9-0C2AE947ADDF} = {642A8704-8500-4900-8F4C-42E37AF892B9}
+		{FB10F6C2-3022-4BB6-A219-9C2730C9AD28} = {642A8704-8500-4900-8F4C-42E37AF892B9}
+		{03A51C60-B41B-409B-97AA-4084042C78D7} = {1728C929-9945-4AC8-98B6-5D8C0B28A7A3}
+		{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8} = {1728C929-9945-4AC8-98B6-5D8C0B28A7A3}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29C14AD7-DC03-45DC-897D-8DACC762707E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29C14AD7-DC03-45DC-897D-8DACC762707E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48CD5889-4CB2-42C2-A61C-8ECA3B267584}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EBD959DC-A03A-4B65-ADDE-0963075AE1EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EBD959DC-A03A-4B65-ADDE-0963075AE1EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EBD959DC-A03A-4B65-ADDE-0963075AE1EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EBD959DC-A03A-4B65-ADDE-0963075AE1EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{414D74F9-9783-4B1D-9F14-4B2F873D16F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{414D74F9-9783-4B1D-9F14-4B2F873D16F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{414D74F9-9783-4B1D-9F14-4B2F873D16F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{414D74F9-9783-4B1D-9F14-4B2F873D16F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3972DF32-E184-47A8-ACEB-BE363237B00E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3972DF32-E184-47A8-ACEB-BE363237B00E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3972DF32-E184-47A8-ACEB-BE363237B00E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3972DF32-E184-47A8-ACEB-BE363237B00E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AF52F6B-61C2-4D23-A69C-6FCF8D138C58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03A51C60-B41B-409B-97AA-4084042C78D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03A51C60-B41B-409B-97AA-4084042C78D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03A51C60-B41B-409B-97AA-4084042C78D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03A51C60-B41B-409B-97AA-4084042C78D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F663AB41-D3C8-4DEB-BCCE-AD9322A3CE41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0FB000A-C607-4CBB-9223-A5FCA85DF23F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DF4EEAD-A1DF-4543-98B0-8975CC1AC8C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E50759EE-662D-451E-95E9-0C2AE947ADDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E50759EE-662D-451E-95E9-0C2AE947ADDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E50759EE-662D-451E-95E9-0C2AE947ADDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E50759EE-662D-451E-95E9-0C2AE947ADDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB10F6C2-3022-4BB6-A219-9C2730C9AD28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB10F6C2-3022-4BB6-A219-9C2730C9AD28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB10F6C2-3022-4BB6-A219-9C2730C9AD28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB10F6C2-3022-4BB6-A219-9C2730C9AD28}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7D9E5F2F-5677-40FC-AD04-FA7D603E4806} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{29C14AD7-DC03-45DC-897D-8DACC762707E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{48CD5889-4CB2-42C2-A61C-8ECA3B267584} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{EBD959DC-A03A-4B65-ADDE-0963075AE1EA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FA9C1576-C430-4251-8153-E1973650E1A1}
+		SolutionGuid = {AF704C7D-836B-41D4-919E-B0874D934A08}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln b/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
index 227ff28795df39..9da8af5615b7bc 100644
--- a/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
+++ b/src/libraries/System.IO.FileSystem.Primitives/System.IO.FileSystem.Primitives.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests.csproj", "{2EF7EFA5-F171-4CAB-8A29-32833949FD87}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6C05678E-394C-4CFF-B453-A18E28C8F2C3} = {6C05678E-394C-4CFF-B453-A18E28C8F2C3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0DF82830-45C1-453B-9436-C5A8FECE7110}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives", "src\System.IO.FileSystem.Primitives.csproj", "{6C05678E-394C-4CFF-B453-A18E28C8F2C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{45201E24-47CD-47AE-9350-B48C3FBE74EC} = {45201E24-47CD-47AE-9350-B48C3FBE74EC}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{15A7688F-E2A6-4240-BCD7-727F547E651D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives", "ref\System.IO.FileSystem.Primitives.csproj", "{45201E24-47CD-47AE-9350-B48C3FBE74EC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives", "ref\System.IO.FileSystem.Primitives.csproj", "{08B0A52E-C11E-4F88-957E-561E8E3621EE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives", "src\System.IO.FileSystem.Primitives.csproj", "{F0212CB8-23E6-4D89-A90E-C6F820778F53}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Primitives.Tests", "tests\System.IO.FileSystem.Primitives.Tests.csproj", "{AA882A52-10CB-4272-BF22-A7964627E266}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3359691A-F781-449B-9DAA-5D45122859BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B6EB5E0A-FF03-42B9-8006-BF6C8FCBC224}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{5AB142C5-28CB-4FF1-BDCA-602486B9E87C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8CF7699F-EE9B-455A-874A-3D7757664F54}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{DDC23A6A-1C86-4F85-9F30-03137B5BA840}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1078610D-240D-48C1-917F-0D2564D4080F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D4E612B8-AAB2-43F5-847E-0D9ED42E8B06}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0943B3EB-BC14-47BF-A24E-A0B867717B4E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0DF82830-45C1-453B-9436-C5A8FECE7110} = {1078610D-240D-48C1-917F-0D2564D4080F}
+		{AA882A52-10CB-4272-BF22-A7964627E266} = {1078610D-240D-48C1-917F-0D2564D4080F}
+		{15A7688F-E2A6-4240-BCD7-727F547E651D} = {D4E612B8-AAB2-43F5-847E-0D9ED42E8B06}
+		{08B0A52E-C11E-4F88-957E-561E8E3621EE} = {D4E612B8-AAB2-43F5-847E-0D9ED42E8B06}
+		{3359691A-F781-449B-9DAA-5D45122859BB} = {D4E612B8-AAB2-43F5-847E-0D9ED42E8B06}
+		{8CF7699F-EE9B-455A-874A-3D7757664F54} = {D4E612B8-AAB2-43F5-847E-0D9ED42E8B06}
+		{DDC23A6A-1C86-4F85-9F30-03137B5BA840} = {D4E612B8-AAB2-43F5-847E-0D9ED42E8B06}
+		{F0212CB8-23E6-4D89-A90E-C6F820778F53} = {0943B3EB-BC14-47BF-A24E-A0B867717B4E}
+		{5AB142C5-28CB-4FF1-BDCA-602486B9E87C} = {0943B3EB-BC14-47BF-A24E-A0B867717B4E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2EF7EFA5-F171-4CAB-8A29-32833949FD87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C05678E-394C-4CFF-B453-A18E28C8F2C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45201E24-47CD-47AE-9350-B48C3FBE74EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45201E24-47CD-47AE-9350-B48C3FBE74EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45201E24-47CD-47AE-9350-B48C3FBE74EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45201E24-47CD-47AE-9350-B48C3FBE74EC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6EB5E0A-FF03-42B9-8006-BF6C8FCBC224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6EB5E0A-FF03-42B9-8006-BF6C8FCBC224}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6EB5E0A-FF03-42B9-8006-BF6C8FCBC224}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6EB5E0A-FF03-42B9-8006-BF6C8FCBC224}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DF82830-45C1-453B-9436-C5A8FECE7110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DF82830-45C1-453B-9436-C5A8FECE7110}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DF82830-45C1-453B-9436-C5A8FECE7110}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DF82830-45C1-453B-9436-C5A8FECE7110}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15A7688F-E2A6-4240-BCD7-727F547E651D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15A7688F-E2A6-4240-BCD7-727F547E651D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15A7688F-E2A6-4240-BCD7-727F547E651D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15A7688F-E2A6-4240-BCD7-727F547E651D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08B0A52E-C11E-4F88-957E-561E8E3621EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08B0A52E-C11E-4F88-957E-561E8E3621EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08B0A52E-C11E-4F88-957E-561E8E3621EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08B0A52E-C11E-4F88-957E-561E8E3621EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0212CB8-23E6-4D89-A90E-C6F820778F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0212CB8-23E6-4D89-A90E-C6F820778F53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0212CB8-23E6-4D89-A90E-C6F820778F53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0212CB8-23E6-4D89-A90E-C6F820778F53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA882A52-10CB-4272-BF22-A7964627E266}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA882A52-10CB-4272-BF22-A7964627E266}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA882A52-10CB-4272-BF22-A7964627E266}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA882A52-10CB-4272-BF22-A7964627E266}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3359691A-F781-449B-9DAA-5D45122859BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3359691A-F781-449B-9DAA-5D45122859BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3359691A-F781-449B-9DAA-5D45122859BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3359691A-F781-449B-9DAA-5D45122859BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AB142C5-28CB-4FF1-BDCA-602486B9E87C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CF7699F-EE9B-455A-874A-3D7757664F54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CF7699F-EE9B-455A-874A-3D7757664F54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CF7699F-EE9B-455A-874A-3D7757664F54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CF7699F-EE9B-455A-874A-3D7757664F54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDC23A6A-1C86-4F85-9F30-03137B5BA840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDC23A6A-1C86-4F85-9F30-03137B5BA840}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDC23A6A-1C86-4F85-9F30-03137B5BA840}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDC23A6A-1C86-4F85-9F30-03137B5BA840}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2EF7EFA5-F171-4CAB-8A29-32833949FD87} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6C05678E-394C-4CFF-B453-A18E28C8F2C3} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{45201E24-47CD-47AE-9350-B48C3FBE74EC} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{B6EB5E0A-FF03-42B9-8006-BF6C8FCBC224} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {878FD5EE-DBF9-4BE8-AAD0-ECE24BE09931}
+		SolutionGuid = {7C05E00F-F058-4C38-8E8B-3B00E8829E82}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln b/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
index b5e711f3231993..c8640b1f13dee1 100644
--- a/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
+++ b/src/libraries/System.IO.FileSystem.Watcher/System.IO.FileSystem.Watcher.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher.Tests", "tests\System.IO.FileSystem.Watcher.Tests.csproj", "{20411A66-C7A4-4941-8FA2-66308365FD22}"
-	ProjectSection(ProjectDependencies) = postProject
-		{77E702D9-C6D8-4CE4-9941-D3056C3CCBED} = {77E702D9-C6D8-4CE4-9941-D3056C3CCBED}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3306C0C4-8CD3-4952-9DBC-E8A8FDECA446}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher", "src\System.IO.FileSystem.Watcher.csproj", "{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}"
-	ProjectSection(ProjectDependencies) = postProject
-		{34E2C0E2-6C09-427D-BB75-702B3388CFC5} = {34E2C0E2-6C09-427D-BB75-702B3388CFC5}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{BDB2BA99-9076-4548-9048-D41567B2F704}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher", "ref\System.IO.FileSystem.Watcher.csproj", "{34E2C0E2-6C09-427D-BB75-702B3388CFC5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher", "ref\System.IO.FileSystem.Watcher.csproj", "{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher", "src\System.IO.FileSystem.Watcher.csproj", "{310BA7DB-1A9E-46E1-B414-606474FFFFFA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Watcher.Tests", "tests\System.IO.FileSystem.Watcher.Tests.csproj", "{8928F2EE-437E-4AB8-9038-077179F37939}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1D98691D-E3BD-483A-B449-F8F875A0BC0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2544D517-0C81-48BC-9915-DE9131114FE9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BB57F4F3-0519-4846-8CEC-04D2D2CFE144}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{DD3C3047-8C29-48CD-9C4C-4770428BD41B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{7CB0CA90-66A1-4FE3-BB81-3C56152971CB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EC2A6842-5A52-4E74-A46E-8D66C730C5E9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{50878232-5872-425B-8CFF-5D500B631E87}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9625F374-051D-4C97-8F2E-89B60E30346E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{3306C0C4-8CD3-4952-9DBC-E8A8FDECA446} = {EC2A6842-5A52-4E74-A46E-8D66C730C5E9}
+		{8928F2EE-437E-4AB8-9038-077179F37939} = {EC2A6842-5A52-4E74-A46E-8D66C730C5E9}
+		{BDB2BA99-9076-4548-9048-D41567B2F704} = {50878232-5872-425B-8CFF-5D500B631E87}
+		{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202} = {50878232-5872-425B-8CFF-5D500B631E87}
+		{1D98691D-E3BD-483A-B449-F8F875A0BC0B} = {50878232-5872-425B-8CFF-5D500B631E87}
+		{DD3C3047-8C29-48CD-9C4C-4770428BD41B} = {50878232-5872-425B-8CFF-5D500B631E87}
+		{7CB0CA90-66A1-4FE3-BB81-3C56152971CB} = {50878232-5872-425B-8CFF-5D500B631E87}
+		{310BA7DB-1A9E-46E1-B414-606474FFFFFA} = {9625F374-051D-4C97-8F2E-89B60E30346E}
+		{BB57F4F3-0519-4846-8CEC-04D2D2CFE144} = {9625F374-051D-4C97-8F2E-89B60E30346E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{20411A66-C7A4-4941-8FA2-66308365FD22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{20411A66-C7A4-4941-8FA2-66308365FD22}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{20411A66-C7A4-4941-8FA2-66308365FD22}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{20411A66-C7A4-4941-8FA2-66308365FD22}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77E702D9-C6D8-4CE4-9941-D3056C3CCBED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{34E2C0E2-6C09-427D-BB75-702B3388CFC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2544D517-0C81-48BC-9915-DE9131114FE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2544D517-0C81-48BC-9915-DE9131114FE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2544D517-0C81-48BC-9915-DE9131114FE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2544D517-0C81-48BC-9915-DE9131114FE9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3306C0C4-8CD3-4952-9DBC-E8A8FDECA446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3306C0C4-8CD3-4952-9DBC-E8A8FDECA446}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3306C0C4-8CD3-4952-9DBC-E8A8FDECA446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3306C0C4-8CD3-4952-9DBC-E8A8FDECA446}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDB2BA99-9076-4548-9048-D41567B2F704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDB2BA99-9076-4548-9048-D41567B2F704}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDB2BA99-9076-4548-9048-D41567B2F704}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDB2BA99-9076-4548-9048-D41567B2F704}.Release|Any CPU.Build.0 = Release|Any CPU
+		{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{318B6BCF-3AB6-40A7-B16A-E40EA4F3B202}.Release|Any CPU.Build.0 = Release|Any CPU
+		{310BA7DB-1A9E-46E1-B414-606474FFFFFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{310BA7DB-1A9E-46E1-B414-606474FFFFFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{310BA7DB-1A9E-46E1-B414-606474FFFFFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{310BA7DB-1A9E-46E1-B414-606474FFFFFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8928F2EE-437E-4AB8-9038-077179F37939}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8928F2EE-437E-4AB8-9038-077179F37939}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8928F2EE-437E-4AB8-9038-077179F37939}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8928F2EE-437E-4AB8-9038-077179F37939}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D98691D-E3BD-483A-B449-F8F875A0BC0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB57F4F3-0519-4846-8CEC-04D2D2CFE144}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD3C3047-8C29-48CD-9C4C-4770428BD41B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD3C3047-8C29-48CD-9C4C-4770428BD41B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD3C3047-8C29-48CD-9C4C-4770428BD41B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD3C3047-8C29-48CD-9C4C-4770428BD41B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CB0CA90-66A1-4FE3-BB81-3C56152971CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CB0CA90-66A1-4FE3-BB81-3C56152971CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CB0CA90-66A1-4FE3-BB81-3C56152971CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CB0CA90-66A1-4FE3-BB81-3C56152971CB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{20411A66-C7A4-4941-8FA2-66308365FD22} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{77E702D9-C6D8-4CE4-9941-D3056C3CCBED} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{34E2C0E2-6C09-427D-BB75-702B3388CFC5} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{2544D517-0C81-48BC-9915-DE9131114FE9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7F6EB125-D870-43DA-9A82-6792C1031754}
+		SolutionGuid = {C3D76AA3-27C1-48BF-9474-42E0495BA814}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
index 3d4bdc1f490f93..4c3dc58180ee89 100644
--- a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
+++ b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln
@@ -1,66 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests.csproj", "{F0D49126-6A1C-42D5-9428-4374C868BAF8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1B528B61-14F9-4BFC-A79A-F0BDB3339150} = {1B528B61-14F9-4BFC-A79A-F0BDB3339150}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D350D6E7-52F1-40A4-B646-C178F6BBB689}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem", "src\System.IO.FileSystem.csproj", "{1B528B61-14F9-4BFC-A79A-F0BDB3339150}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482} = {4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{A2A52059-8079-48AF-AF50-9FA2DC962B21}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem", "ref\System.IO.FileSystem.csproj", "{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem", "ref\System.IO.FileSystem.csproj", "{E4865620-8109-42F9-B1FE-B38C6CA1A3A0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem", "src\System.IO.FileSystem.csproj", "{877E39A8-51CB-463A-AF4C-6FAE4F438075}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Manual.Tests", "tests\ManualTests\System.IO.FileSystem.Manual.Tests.csproj", "{534152EB-14A8-4EF4-B181-342A555337F1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Tests", "tests\System.IO.FileSystem.Tests.csproj", "{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{66810085-C596-4ED4-ACEE-C939CBD55C4E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{79A74577-C550-4264-B352-51D304796B89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.IO.FileSystem.ManualTests", "tests\ManualTests\System.IO.FileSystem.Manual.Tests.csproj", "{70FA2031-8D6E-4127-901E-2B0D90420E08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D7DF8034-3AE5-4DEF-BCC4-6353239391BF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CCB1259A-1BCD-40CA-8FC2-2720BE4D00F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{06DD5AA8-FDA6-495B-A8D1-8CE83C78DE6C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A727AF9-4F39-4109-BB8F-813286031DC9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{32A31E04-2554-4223-BED8-45757408B4F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D9FB1730-B750-4C0D-8D24-8C992DEB6034}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D350D6E7-52F1-40A4-B646-C178F6BBB689} = {1A727AF9-4F39-4109-BB8F-813286031DC9}
+		{534152EB-14A8-4EF4-B181-342A555337F1} = {1A727AF9-4F39-4109-BB8F-813286031DC9}
+		{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B} = {1A727AF9-4F39-4109-BB8F-813286031DC9}
+		{A2A52059-8079-48AF-AF50-9FA2DC962B21} = {32A31E04-2554-4223-BED8-45757408B4F6}
+		{E4865620-8109-42F9-B1FE-B38C6CA1A3A0} = {32A31E04-2554-4223-BED8-45757408B4F6}
+		{79A74577-C550-4264-B352-51D304796B89} = {32A31E04-2554-4223-BED8-45757408B4F6}
+		{CCB1259A-1BCD-40CA-8FC2-2720BE4D00F3} = {32A31E04-2554-4223-BED8-45757408B4F6}
+		{06DD5AA8-FDA6-495B-A8D1-8CE83C78DE6C} = {32A31E04-2554-4223-BED8-45757408B4F6}
+		{877E39A8-51CB-463A-AF4C-6FAE4F438075} = {D9FB1730-B750-4C0D-8D24-8C992DEB6034}
+		{D7DF8034-3AE5-4DEF-BCC4-6353239391BF} = {D9FB1730-B750-4C0D-8D24-8C992DEB6034}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F0D49126-6A1C-42D5-9428-4374C868BAF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F0D49126-6A1C-42D5-9428-4374C868BAF8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1B528B61-14F9-4BFC-A79A-F0BDB3339150}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66810085-C596-4ED4-ACEE-C939CBD55C4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66810085-C596-4ED4-ACEE-C939CBD55C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66810085-C596-4ED4-ACEE-C939CBD55C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66810085-C596-4ED4-ACEE-C939CBD55C4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{70FA2031-8D6E-4127-901E-2B0D90420E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70FA2031-8D6E-4127-901E-2B0D90420E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70FA2031-8D6E-4127-901E-2B0D90420E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70FA2031-8D6E-4127-901E-2B0D90420E08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D350D6E7-52F1-40A4-B646-C178F6BBB689}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D350D6E7-52F1-40A4-B646-C178F6BBB689}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D350D6E7-52F1-40A4-B646-C178F6BBB689}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D350D6E7-52F1-40A4-B646-C178F6BBB689}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2A52059-8079-48AF-AF50-9FA2DC962B21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2A52059-8079-48AF-AF50-9FA2DC962B21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2A52059-8079-48AF-AF50-9FA2DC962B21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2A52059-8079-48AF-AF50-9FA2DC962B21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4865620-8109-42F9-B1FE-B38C6CA1A3A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4865620-8109-42F9-B1FE-B38C6CA1A3A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4865620-8109-42F9-B1FE-B38C6CA1A3A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4865620-8109-42F9-B1FE-B38C6CA1A3A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{877E39A8-51CB-463A-AF4C-6FAE4F438075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{877E39A8-51CB-463A-AF4C-6FAE4F438075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{877E39A8-51CB-463A-AF4C-6FAE4F438075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{877E39A8-51CB-463A-AF4C-6FAE4F438075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{534152EB-14A8-4EF4-B181-342A555337F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{534152EB-14A8-4EF4-B181-342A555337F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{534152EB-14A8-4EF4-B181-342A555337F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{534152EB-14A8-4EF4-B181-342A555337F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A8E16D3-8A22-4076-BB48-2CD1FBFAF81B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79A74577-C550-4264-B352-51D304796B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A74577-C550-4264-B352-51D304796B89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79A74577-C550-4264-B352-51D304796B89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79A74577-C550-4264-B352-51D304796B89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7DF8034-3AE5-4DEF-BCC4-6353239391BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCB1259A-1BCD-40CA-8FC2-2720BE4D00F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCB1259A-1BCD-40CA-8FC2-2720BE4D00F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCB1259A-1BCD-40CA-8FC2-2720BE4D00F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCB1259A-1BCD-40CA-8FC2-2720BE4D00F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06DD5AA8-FDA6-495B-A8D1-8CE83C78DE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06DD5AA8-FDA6-495B-A8D1-8CE83C78DE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06DD5AA8-FDA6-495B-A8D1-8CE83C78DE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06DD5AA8-FDA6-495B-A8D1-8CE83C78DE6C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F0D49126-6A1C-42D5-9428-4374C868BAF8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1B528B61-14F9-4BFC-A79A-F0BDB3339150} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4B15C12E-B6AB-4B05-8ECA-C2E2AEA67482} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{66810085-C596-4ED4-ACEE-C939CBD55C4E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9BEAA279-BD7B-42E8-91C5-519267FEB4BB}
+		SolutionGuid = {320D63B0-B2D5-467B-92EC-1E2240B90263}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
index 28752f5559bf09..e6ed0fca88d039 100644
--- a/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
+++ b/src/libraries/System.IO.IsolatedStorage/System.IO.IsolatedStorage.sln
@@ -1,60 +1,163 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage.Tests", "tests\System.IO.IsolatedStorage.Tests.csproj", "{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FAF5D1E4-BA43-4663-8429-C069066D75CB} = {FAF5D1E4-BA43-4663-8429-C069066D75CB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{16B2F442-5A88-4C59-A9FE-AB4357D3E657}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage", "src\System.IO.IsolatedStorage.csproj", "{FAF5D1E4-BA43-4663-8429-C069066D75CB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{750200D5-661A-42AA-9E1F-2A151F5AEE74} = {750200D5-661A-42AA-9E1F-2A151F5AEE74}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{45442F29-2605-43C4-BED3-0ADCEE93FDD1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage", "ref\System.IO.IsolatedStorage.csproj", "{750200D5-661A-42AA-9E1F-2A151F5AEE74}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{CBD0D70E-1470-43BF-BE8D-59756A3A2364}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{5F6B682F-9901-475B-8E81-F3B19E0D3DA4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{C97D00DE-DB94-4FFD-BC00-7432858602A6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{BA259C30-B614-48A6-B980-848FA2F86795}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{CFEAF957-2926-44F8-8F50-A362BF4A38C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage", "ref\System.IO.IsolatedStorage.csproj", "{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage", "src\System.IO.IsolatedStorage.csproj", "{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.IsolatedStorage.Tests", "tests\System.IO.IsolatedStorage.Tests.csproj", "{88125FEA-D679-4A1A-8736-A18EC13AFC75}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{580DE958-E1CD-4DF9-B225-671E5447DD09}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3665C7DC-78BA-46F4-B9EC-0EF11A1F6E4C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{9A77FB40-0BE3-4A7B-B147-374D186226DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{94E1FBF3-D07E-42CC-BDE9-195068C29632}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{04B37BF3-6DB0-4C49-90F0-DCFAD18AF0B8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{2C9EFD7A-F153-47BF-B2E6-73094696DF45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{69473F4F-C67A-47B7-9085-1B3254BDB179}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0B89067B-7875-4F45-A2E6-D15A98C3310A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EB877145-22F1-4F66-80EE-26E37115FC7E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657} = {69473F4F-C67A-47B7-9085-1B3254BDB179}
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75} = {69473F4F-C67A-47B7-9085-1B3254BDB179}
+		{45442F29-2605-43C4-BED3-0ADCEE93FDD1} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{5F6B682F-9901-475B-8E81-F3B19E0D3DA4} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{C97D00DE-DB94-4FFD-BC00-7432858602A6} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{3665C7DC-78BA-46F4-B9EC-0EF11A1F6E4C} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{04B37BF3-6DB0-4C49-90F0-DCFAD18AF0B8} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA} = {0B89067B-7875-4F45-A2E6-D15A98C3310A}
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{CFEAF957-2926-44F8-8F50-A362BF4A38C7} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{580DE958-E1CD-4DF9-B225-671E5447DD09} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{9A77FB40-0BE3-4A7B-B147-374D186226DB} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45} = {EB877145-22F1-4F66-80EE-26E37115FC7E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BF4F9507-8FBD-45EA-81C9-3ED89C052C91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FAF5D1E4-BA43-4663-8429-C069066D75CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FAF5D1E4-BA43-4663-8429-C069066D75CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{750200D5-661A-42AA-9E1F-2A151F5AEE74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{750200D5-661A-42AA-9E1F-2A151F5AEE74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{750200D5-661A-42AA-9E1F-2A151F5AEE74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{750200D5-661A-42AA-9E1F-2A151F5AEE74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA259C30-B614-48A6-B980-848FA2F86795}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA259C30-B614-48A6-B980-848FA2F86795}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA259C30-B614-48A6-B980-848FA2F86795}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA259C30-B614-48A6-B980-848FA2F86795}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16B2F442-5A88-4C59-A9FE-AB4357D3E657}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45442F29-2605-43C4-BED3-0ADCEE93FDD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45442F29-2605-43C4-BED3-0ADCEE93FDD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45442F29-2605-43C4-BED3-0ADCEE93FDD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45442F29-2605-43C4-BED3-0ADCEE93FDD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBD0D70E-1470-43BF-BE8D-59756A3A2364}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AFF1901-8D72-43CF-AFE2-0F8A5CFD5C3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F6B682F-9901-475B-8E81-F3B19E0D3DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F6B682F-9901-475B-8E81-F3B19E0D3DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F6B682F-9901-475B-8E81-F3B19E0D3DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F6B682F-9901-475B-8E81-F3B19E0D3DA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C97D00DE-DB94-4FFD-BC00-7432858602A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C97D00DE-DB94-4FFD-BC00-7432858602A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C97D00DE-DB94-4FFD-BC00-7432858602A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C97D00DE-DB94-4FFD-BC00-7432858602A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFEAF957-2926-44F8-8F50-A362BF4A38C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB10AFC2-FC8C-49B4-9BB1-6410E4D3A30A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9ACE205-2927-4D66-8E6F-D2C1E6E6239D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88125FEA-D679-4A1A-8736-A18EC13AFC75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCFC9811-7DBF-47DA-BD68-2E8EEC33F7EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{580DE958-E1CD-4DF9-B225-671E5447DD09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{580DE958-E1CD-4DF9-B225-671E5447DD09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{580DE958-E1CD-4DF9-B225-671E5447DD09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{580DE958-E1CD-4DF9-B225-671E5447DD09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3665C7DC-78BA-46F4-B9EC-0EF11A1F6E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3665C7DC-78BA-46F4-B9EC-0EF11A1F6E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3665C7DC-78BA-46F4-B9EC-0EF11A1F6E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3665C7DC-78BA-46F4-B9EC-0EF11A1F6E4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A77FB40-0BE3-4A7B-B147-374D186226DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A77FB40-0BE3-4A7B-B147-374D186226DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A77FB40-0BE3-4A7B-B147-374D186226DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A77FB40-0BE3-4A7B-B147-374D186226DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94E1FBF3-D07E-42CC-BDE9-195068C29632}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05F3ED11-AB8C-47EA-BEB8-BB25FF5BC2C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04B37BF3-6DB0-4C49-90F0-DCFAD18AF0B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04B37BF3-6DB0-4C49-90F0-DCFAD18AF0B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B37BF3-6DB0-4C49-90F0-DCFAD18AF0B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04B37BF3-6DB0-4C49-90F0-DCFAD18AF0B8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78CF8F5B-3B0F-4DED-8669-F1C5DDB7141A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57DD5F0B-1CEE-4B33-9955-5CE4893EEFEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C9EFD7A-F153-47BF-B2E6-73094696DF45}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{BF4F9507-8FBD-45EA-81C9-3ED89C052C91} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{FAF5D1E4-BA43-4663-8429-C069066D75CB} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{750200D5-661A-42AA-9E1F-2A151F5AEE74} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{BA259C30-B614-48A6-B980-848FA2F86795} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B771C8B1-8D0C-4DF8-95F5-9CFD75660C47}
+		SolutionGuid = {C61D5D56-FD5E-4BF4-89D0-E7A23AE83333}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
index 0e627a43b93ff8..e076fb7560c874 100644
--- a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
+++ b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles.Tests", "tests\System.IO.MemoryMappedFiles.Tests.csproj", "{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}"
-	ProjectSection(ProjectDependencies) = postProject
-		{16EE5522-F387-4C9E-9EF2-B5134B043F37} = {16EE5522-F387-4C9E-9EF2-B5134B043F37}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{53746669-11C3-4DA9-B9C3-4CA0B79D4712}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles", "src\System.IO.MemoryMappedFiles.csproj", "{16EE5522-F387-4C9E-9EF2-B5134B043F37}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F2740000-E771-4E54-9287-5A1FDF8872F4} = {F2740000-E771-4E54-9287-5A1FDF8872F4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{95A43A96-F52F-4B2B-9001-4429CB66DFAC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles", "ref\System.IO.MemoryMappedFiles.csproj", "{F2740000-E771-4E54-9287-5A1FDF8872F4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles", "ref\System.IO.MemoryMappedFiles.csproj", "{F4ACA509-281C-43DA-A57D-52D9913321AE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles", "src\System.IO.MemoryMappedFiles.csproj", "{4A95E6CD-A466-46BC-A6C7-C65DA45B3388}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles.Tests", "tests\System.IO.MemoryMappedFiles.Tests.csproj", "{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8B9258B7-1C54-4FFE-9512-2B7323AEF92A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F33E1C94-7132-446D-9543-4818C8F89E76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4B990529-DAA4-4AEC-A625-FDCA3EF64E25}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F2392763-FAC4-4686-B695-95F7A2C94E39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F575F018-E80D-486C-9A5D-ED299C2FF727}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB54211-C340-44ED-9957-0E8EDD46B78E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{714A3F0B-91A5-4B04-981C-C60C8AC86AF8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7BD0095-6A5F-49A8-9D05-703DB8783948}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{53746669-11C3-4DA9-B9C3-4CA0B79D4712} = {0AB54211-C340-44ED-9957-0E8EDD46B78E}
+		{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860} = {0AB54211-C340-44ED-9957-0E8EDD46B78E}
+		{95A43A96-F52F-4B2B-9001-4429CB66DFAC} = {714A3F0B-91A5-4B04-981C-C60C8AC86AF8}
+		{F4ACA509-281C-43DA-A57D-52D9913321AE} = {714A3F0B-91A5-4B04-981C-C60C8AC86AF8}
+		{8B9258B7-1C54-4FFE-9512-2B7323AEF92A} = {714A3F0B-91A5-4B04-981C-C60C8AC86AF8}
+		{F2392763-FAC4-4686-B695-95F7A2C94E39} = {714A3F0B-91A5-4B04-981C-C60C8AC86AF8}
+		{F575F018-E80D-486C-9A5D-ED299C2FF727} = {714A3F0B-91A5-4B04-981C-C60C8AC86AF8}
+		{4A95E6CD-A466-46BC-A6C7-C65DA45B3388} = {E7BD0095-6A5F-49A8-9D05-703DB8783948}
+		{4B990529-DAA4-4AEC-A625-FDCA3EF64E25} = {E7BD0095-6A5F-49A8-9D05-703DB8783948}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D6F6254-B5A3-40FF-8925-68AA8D1CE933}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16EE5522-F387-4C9E-9EF2-B5134B043F37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16EE5522-F387-4C9E-9EF2-B5134B043F37}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16EE5522-F387-4C9E-9EF2-B5134B043F37}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16EE5522-F387-4C9E-9EF2-B5134B043F37}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F2740000-E771-4E54-9287-5A1FDF8872F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F2740000-E771-4E54-9287-5A1FDF8872F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2740000-E771-4E54-9287-5A1FDF8872F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F2740000-E771-4E54-9287-5A1FDF8872F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F33E1C94-7132-446D-9543-4818C8F89E76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F33E1C94-7132-446D-9543-4818C8F89E76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F33E1C94-7132-446D-9543-4818C8F89E76}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F33E1C94-7132-446D-9543-4818C8F89E76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53746669-11C3-4DA9-B9C3-4CA0B79D4712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53746669-11C3-4DA9-B9C3-4CA0B79D4712}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53746669-11C3-4DA9-B9C3-4CA0B79D4712}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53746669-11C3-4DA9-B9C3-4CA0B79D4712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95A43A96-F52F-4B2B-9001-4429CB66DFAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95A43A96-F52F-4B2B-9001-4429CB66DFAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95A43A96-F52F-4B2B-9001-4429CB66DFAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95A43A96-F52F-4B2B-9001-4429CB66DFAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4ACA509-281C-43DA-A57D-52D9913321AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4ACA509-281C-43DA-A57D-52D9913321AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4ACA509-281C-43DA-A57D-52D9913321AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4ACA509-281C-43DA-A57D-52D9913321AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A95E6CD-A466-46BC-A6C7-C65DA45B3388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A95E6CD-A466-46BC-A6C7-C65DA45B3388}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A95E6CD-A466-46BC-A6C7-C65DA45B3388}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A95E6CD-A466-46BC-A6C7-C65DA45B3388}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD44D7FF-CFE0-4E98-9E33-C4D9A5F83860}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B9258B7-1C54-4FFE-9512-2B7323AEF92A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B990529-DAA4-4AEC-A625-FDCA3EF64E25}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2392763-FAC4-4686-B695-95F7A2C94E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2392763-FAC4-4686-B695-95F7A2C94E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2392763-FAC4-4686-B695-95F7A2C94E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2392763-FAC4-4686-B695-95F7A2C94E39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F575F018-E80D-486C-9A5D-ED299C2FF727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F575F018-E80D-486C-9A5D-ED299C2FF727}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F575F018-E80D-486C-9A5D-ED299C2FF727}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F575F018-E80D-486C-9A5D-ED299C2FF727}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9D6F6254-B5A3-40FF-8925-68AA8D1CE933} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{16EE5522-F387-4C9E-9EF2-B5134B043F37} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F2740000-E771-4E54-9287-5A1FDF8872F4} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F33E1C94-7132-446D-9543-4818C8F89E76} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0526AB67-5CE5-4080-B8DC-9C67D2EC2B76}
+		SolutionGuid = {F8DDBB46-7ACE-4C13-91B4-FFB7E93363D9}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
index 5af6de1cb39097..29473fa82c1dc3 100644
--- a/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
+++ b/src/libraries/System.IO.Packaging/System.IO.Packaging.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging.Tests", "tests\System.IO.Packaging.Tests.csproj", "{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1F827C19-6023-48D3-909F-9F43AB42FAF0} = {1F827C19-6023-48D3-909F-9F43AB42FAF0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "src\System.IO.Packaging.csproj", "{1F827C19-6023-48D3-909F-9F43AB42FAF0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4DD91348-1D1F-4964-B5CB-047D916E79EE} = {4DD91348-1D1F-4964-B5CB-047D916E79EE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{849F7310-6573-4623-BB29-FDD629FCBDB3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "ref\System.IO.Packaging.csproj", "{4DD91348-1D1F-4964-B5CB-047D916E79EE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "ref\System.IO.Packaging.csproj", "{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "src\System.IO.Packaging.csproj", "{C553FA20-C4C0-48A2-B841-12F2F860E21F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging.Tests", "tests\System.IO.Packaging.Tests.csproj", "{588B83D6-132B-4399-B31E-4B40CD9CCAE6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4E44D7F4-80D7-4F8A-9550-54773444F842}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C4543F74-9723-4662-B8E5-7E6DA5C91E6B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{78283948-D5F0-4F76-8B4A-F4D19EC206F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{07410F1F-3953-439D-BB46-B2263C8E1B5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EC8B7531-7490-442D-950C-E98A91CEBC98}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{116A3347-80EA-4505-9F78-9751D8511A11}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACBE957D-3B4B-408C-8EDC-82CA86827D27}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{519320BA-7BF5-4927-82E6-4C21A8A832C5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F} = {116A3347-80EA-4505-9F78-9751D8511A11}
+		{588B83D6-132B-4399-B31E-4B40CD9CCAE6} = {116A3347-80EA-4505-9F78-9751D8511A11}
+		{849F7310-6573-4623-BB29-FDD629FCBDB3} = {ACBE957D-3B4B-408C-8EDC-82CA86827D27}
+		{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28} = {ACBE957D-3B4B-408C-8EDC-82CA86827D27}
+		{4E44D7F4-80D7-4F8A-9550-54773444F842} = {ACBE957D-3B4B-408C-8EDC-82CA86827D27}
+		{07410F1F-3953-439D-BB46-B2263C8E1B5F} = {ACBE957D-3B4B-408C-8EDC-82CA86827D27}
+		{EC8B7531-7490-442D-950C-E98A91CEBC98} = {ACBE957D-3B4B-408C-8EDC-82CA86827D27}
+		{C553FA20-C4C0-48A2-B841-12F2F860E21F} = {519320BA-7BF5-4927-82E6-4C21A8A832C5}
+		{78283948-D5F0-4F76-8B4A-F4D19EC206F6} = {519320BA-7BF5-4927-82E6-4C21A8A832C5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F827C19-6023-48D3-909F-9F43AB42FAF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F827C19-6023-48D3-909F-9F43AB42FAF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F827C19-6023-48D3-909F-9F43AB42FAF0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F827C19-6023-48D3-909F-9F43AB42FAF0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DD91348-1D1F-4964-B5CB-047D916E79EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DD91348-1D1F-4964-B5CB-047D916E79EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DD91348-1D1F-4964-B5CB-047D916E79EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DD91348-1D1F-4964-B5CB-047D916E79EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4543F74-9723-4662-B8E5-7E6DA5C91E6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4543F74-9723-4662-B8E5-7E6DA5C91E6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4543F74-9723-4662-B8E5-7E6DA5C91E6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4543F74-9723-4662-B8E5-7E6DA5C91E6B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AAE436A2-C2F7-4D1F-8DD4-6E8B00A1338F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{849F7310-6573-4623-BB29-FDD629FCBDB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{849F7310-6573-4623-BB29-FDD629FCBDB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{849F7310-6573-4623-BB29-FDD629FCBDB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{849F7310-6573-4623-BB29-FDD629FCBDB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EF662E4-9A1E-4DAC-A04B-A1461BB6CA28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C553FA20-C4C0-48A2-B841-12F2F860E21F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C553FA20-C4C0-48A2-B841-12F2F860E21F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C553FA20-C4C0-48A2-B841-12F2F860E21F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C553FA20-C4C0-48A2-B841-12F2F860E21F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{588B83D6-132B-4399-B31E-4B40CD9CCAE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E44D7F4-80D7-4F8A-9550-54773444F842}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E44D7F4-80D7-4F8A-9550-54773444F842}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E44D7F4-80D7-4F8A-9550-54773444F842}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E44D7F4-80D7-4F8A-9550-54773444F842}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78283948-D5F0-4F76-8B4A-F4D19EC206F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07410F1F-3953-439D-BB46-B2263C8E1B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07410F1F-3953-439D-BB46-B2263C8E1B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07410F1F-3953-439D-BB46-B2263C8E1B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07410F1F-3953-439D-BB46-B2263C8E1B5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC8B7531-7490-442D-950C-E98A91CEBC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC8B7531-7490-442D-950C-E98A91CEBC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC8B7531-7490-442D-950C-E98A91CEBC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC8B7531-7490-442D-950C-E98A91CEBC98}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C92FF1A4-DEA1-4F0F-9AEB-94C9B2561B57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1F827C19-6023-48D3-909F-9F43AB42FAF0} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4DD91348-1D1F-4964-B5CB-047D916E79EE} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C4543F74-9723-4662-B8E5-7E6DA5C91E6B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FBDC7058-65E0-4B91-A5F8-6725C4A427E9}
+		SolutionGuid = {8F459277-2162-4A3B-BB19-29D4292EFC1F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
index d56df3a8be8699..88a6f208f09bfc 100644
--- a/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
+++ b/src/libraries/System.IO.Pipelines/System.IO.Pipelines.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines.Tests", "tests\System.IO.Pipelines.Tests.csproj", "{9E984EB2-827E-4029-9647-FB5F8B67C553}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "src\System.IO.Pipelines.csproj", "{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9C524CA0-92FF-437B-B568-BCE8A794A69A} = {9C524CA0-92FF-437B-B568-BCE8A794A69A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9AF9D7C9-527B-4BB4-B1A3-A26DEAFB3DC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "ref\System.IO.Pipelines.csproj", "{9C524CA0-92FF-437B-B568-BCE8A794A69A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "ref\System.IO.Pipelines.csproj", "{DC148B85-05DB-43B2-B2AF-958C305C2C0A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "src\System.IO.Pipelines.csproj", "{1DD520A2-ED75-4889-848E-DBDC7BE41873}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines.Tests", "tests\System.IO.Pipelines.Tests.csproj", "{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F72E156F-135A-407E-A723-9BD83B7EDFBC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{FFDC73EC-53C9-4B6E-B468-C477039742D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E0AFC8E8-C697-40B3-A8AD-52788AE1B753}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{90FCF3EB-F36D-4D39-8A4A-623497F54700}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{AB8B533C-817A-4010-9FFD-0206D41307D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A7DEEB5B-C332-4307-852F-8859096F4DCD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{037F66C3-C136-4DB5-9DFA-E5A3D53D32F0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A} = {AB8B533C-817A-4010-9FFD-0206D41307D0}
+		{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08} = {AB8B533C-817A-4010-9FFD-0206D41307D0}
+		{9AF9D7C9-527B-4BB4-B1A3-A26DEAFB3DC0} = {A7DEEB5B-C332-4307-852F-8859096F4DCD}
+		{DC148B85-05DB-43B2-B2AF-958C305C2C0A} = {A7DEEB5B-C332-4307-852F-8859096F4DCD}
+		{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691} = {A7DEEB5B-C332-4307-852F-8859096F4DCD}
+		{E0AFC8E8-C697-40B3-A8AD-52788AE1B753} = {A7DEEB5B-C332-4307-852F-8859096F4DCD}
+		{90FCF3EB-F36D-4D39-8A4A-623497F54700} = {A7DEEB5B-C332-4307-852F-8859096F4DCD}
+		{1DD520A2-ED75-4889-848E-DBDC7BE41873} = {037F66C3-C136-4DB5-9DFA-E5A3D53D32F0}
+		{FFDC73EC-53C9-4B6E-B468-C477039742D8} = {037F66C3-C136-4DB5-9DFA-E5A3D53D32F0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E984EB2-827E-4029-9647-FB5F8B67C553}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E984EB2-827E-4029-9647-FB5F8B67C553}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C524CA0-92FF-437B-B568-BCE8A794A69A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F72E156F-135A-407E-A723-9BD83B7EDFBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F72E156F-135A-407E-A723-9BD83B7EDFBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F72E156F-135A-407E-A723-9BD83B7EDFBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F72E156F-135A-407E-A723-9BD83B7EDFBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{705D4D3B-CE99-4FAC-AB61-07AD8FD3FF3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AF9D7C9-527B-4BB4-B1A3-A26DEAFB3DC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AF9D7C9-527B-4BB4-B1A3-A26DEAFB3DC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AF9D7C9-527B-4BB4-B1A3-A26DEAFB3DC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AF9D7C9-527B-4BB4-B1A3-A26DEAFB3DC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC148B85-05DB-43B2-B2AF-958C305C2C0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC148B85-05DB-43B2-B2AF-958C305C2C0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC148B85-05DB-43B2-B2AF-958C305C2C0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC148B85-05DB-43B2-B2AF-958C305C2C0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DD520A2-ED75-4889-848E-DBDC7BE41873}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DD520A2-ED75-4889-848E-DBDC7BE41873}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DD520A2-ED75-4889-848E-DBDC7BE41873}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DD520A2-ED75-4889-848E-DBDC7BE41873}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B97BE49-ACAD-4DC9-B195-FE23C3DE5D08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6EA39FC-B265-4B3E-B5BA-9D0D2C601691}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFDC73EC-53C9-4B6E-B468-C477039742D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFDC73EC-53C9-4B6E-B468-C477039742D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFDC73EC-53C9-4B6E-B468-C477039742D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFDC73EC-53C9-4B6E-B468-C477039742D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0AFC8E8-C697-40B3-A8AD-52788AE1B753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0AFC8E8-C697-40B3-A8AD-52788AE1B753}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0AFC8E8-C697-40B3-A8AD-52788AE1B753}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0AFC8E8-C697-40B3-A8AD-52788AE1B753}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90FCF3EB-F36D-4D39-8A4A-623497F54700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90FCF3EB-F36D-4D39-8A4A-623497F54700}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90FCF3EB-F36D-4D39-8A4A-623497F54700}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90FCF3EB-F36D-4D39-8A4A-623497F54700}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9E984EB2-827E-4029-9647-FB5F8B67C553} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1032D5F6-5AE7-4002-A0E4-FEBEADFEA977} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{9C524CA0-92FF-437B-B568-BCE8A794A69A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F72E156F-135A-407E-A723-9BD83B7EDFBC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4FA21728-5B35-4F75-9A77-2AC4A5FC5D22}
+		SolutionGuid = {2034EAE9-84E4-42C3-8C1F-AB515D313D5E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln b/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
index 4a3fb342bfcc84..dbfacf9386ca4d 100644
--- a/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
+++ b/src/libraries/System.IO.Pipes.AccessControl/System.IO.Pipes.AccessControl.sln
@@ -1,74 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29411.138
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessControl.Tests", "tests\System.IO.Pipes.AccessControl.Tests.csproj", "{A0356E61-19E1-4722-A53D-5D2616E16312}"
-	ProjectSection(ProjectDependencies) = postProject
-		{40059634-BB03-4A6F-8657-CCE2D376BC8B} = {40059634-BB03-4A6F-8657-CCE2D376BC8B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessControl", "src\System.IO.Pipes.AccessControl.csproj", "{40059634-BB03-4A6F-8657-CCE2D376BC8B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{994DCE47-4CF6-479D-AB1D-4EA6A2809C34} = {994DCE47-4CF6-479D-AB1D-4EA6A2809C34}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B6986743-061A-468B-B228-53B25B6AD75E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessControl", "ref\System.IO.Pipes.AccessControl.csproj", "{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessControl", "ref\System.IO.Pipes.AccessControl.csproj", "{26E03980-4DB8-43B6-8737-1F7CAF7E5089}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessControl", "src\System.IO.Pipes.AccessControl.csproj", "{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.AccessControl.Tests", "tests\System.IO.Pipes.AccessControl.Tests.csproj", "{7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "..\System.IO.Pipes\src\System.IO.Pipes.csproj", "{5AE837A0-E966-41E5-9230-0830BB3E727F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3B8D8597-DC68-4915-8C2A-1DC33E78E607}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A6554F7C-F4FC-463D-9C0F-396B976FDB90}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "..\System.IO.Pipes\src\System.IO.Pipes.csproj", "{D0711B56-E234-45DB-A620-2F43041826BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{7C35E697-38D0-4A2C-BC25-816732BA2D91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E9FBC628-1577-4872-87E5-2C4F85A511F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{C1C408A9-C98D-499B-8C15-61FF831FFAAE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A8A3F5BC-EB3A-418C-8804-B0740217962E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8126C622-598A-4F25-AD19-050365BFADAC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6F5101DE-2A74-487B-881A-EB3B94650450}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6} = {A8A3F5BC-EB3A-418C-8804-B0740217962E}
+		{7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38} = {A8A3F5BC-EB3A-418C-8804-B0740217962E}
+		{B6986743-061A-468B-B228-53B25B6AD75E} = {8126C622-598A-4F25-AD19-050365BFADAC}
+		{26E03980-4DB8-43B6-8737-1F7CAF7E5089} = {8126C622-598A-4F25-AD19-050365BFADAC}
+		{A6554F7C-F4FC-463D-9C0F-396B976FDB90} = {8126C622-598A-4F25-AD19-050365BFADAC}
+		{E9FBC628-1577-4872-87E5-2C4F85A511F3} = {8126C622-598A-4F25-AD19-050365BFADAC}
+		{C1C408A9-C98D-499B-8C15-61FF831FFAAE} = {8126C622-598A-4F25-AD19-050365BFADAC}
+		{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71} = {6F5101DE-2A74-487B-881A-EB3B94650450}
+		{5AE837A0-E966-41E5-9230-0830BB3E727F} = {6F5101DE-2A74-487B-881A-EB3B94650450}
+		{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D} = {6F5101DE-2A74-487B-881A-EB3B94650450}
+		{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0} = {6F5101DE-2A74-487B-881A-EB3B94650450}
+		{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69} = {6F5101DE-2A74-487B-881A-EB3B94650450}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0356E61-19E1-4722-A53D-5D2616E16312}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0356E61-19E1-4722-A53D-5D2616E16312}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40059634-BB03-4A6F-8657-CCE2D376BC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40059634-BB03-4A6F-8657-CCE2D376BC8B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{994DCE47-4CF6-479D-AB1D-4EA6A2809C34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B8D8597-DC68-4915-8C2A-1DC33E78E607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B8D8597-DC68-4915-8C2A-1DC33E78E607}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B8D8597-DC68-4915-8C2A-1DC33E78E607}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B8D8597-DC68-4915-8C2A-1DC33E78E607}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0711B56-E234-45DB-A620-2F43041826BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0711B56-E234-45DB-A620-2F43041826BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0711B56-E234-45DB-A620-2F43041826BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0711B56-E234-45DB-A620-2F43041826BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C35E697-38D0-4A2C-BC25-816732BA2D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C35E697-38D0-4A2C-BC25-816732BA2D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C35E697-38D0-4A2C-BC25-816732BA2D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C35E697-38D0-4A2C-BC25-816732BA2D91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF7DE1B3-C58E-4EBB-86C5-87EB59A177C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6986743-061A-468B-B228-53B25B6AD75E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6986743-061A-468B-B228-53B25B6AD75E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6986743-061A-468B-B228-53B25B6AD75E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6986743-061A-468B-B228-53B25B6AD75E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26E03980-4DB8-43B6-8737-1F7CAF7E5089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26E03980-4DB8-43B6-8737-1F7CAF7E5089}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26E03980-4DB8-43B6-8737-1F7CAF7E5089}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26E03980-4DB8-43B6-8737-1F7CAF7E5089}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6731AC0-E4F2-4E6C-B6DF-63EF396FCB71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E5965B1-EDF8-4FCC-AAC4-C91DFB043E38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AE837A0-E966-41E5-9230-0830BB3E727F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AE837A0-E966-41E5-9230-0830BB3E727F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AE837A0-E966-41E5-9230-0830BB3E727F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AE837A0-E966-41E5-9230-0830BB3E727F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A6554F7C-F4FC-463D-9C0F-396B976FDB90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{846D56B2-A309-41B2-8BF8-89CFB3AF5F1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9FBC628-1577-4872-87E5-2C4F85A511F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9FBC628-1577-4872-87E5-2C4F85A511F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9FBC628-1577-4872-87E5-2C4F85A511F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9FBC628-1577-4872-87E5-2C4F85A511F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8BA6A7D-73FF-428D-9527-65B9BC36E7E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1C408A9-C98D-499B-8C15-61FF831FFAAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1C408A9-C98D-499B-8C15-61FF831FFAAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1C408A9-C98D-499B-8C15-61FF831FFAAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1C408A9-C98D-499B-8C15-61FF831FFAAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9DEC09D-3DC0-428C-A7F0-116CDD43BC69}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A0356E61-19E1-4722-A53D-5D2616E16312} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{40059634-BB03-4A6F-8657-CCE2D376BC8B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{994DCE47-4CF6-479D-AB1D-4EA6A2809C34} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3B8D8597-DC68-4915-8C2A-1DC33E78E607} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D0711B56-E234-45DB-A620-2F43041826BB} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7C35E697-38D0-4A2C-BC25-816732BA2D91} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AFD36AE1-C562-46E4-8D24-6F36C0F106B1}
+		SolutionGuid = {A148100C-0767-46F2-99CB-3AF298DD788F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
index a331d094f291d5..c172a21c333e58 100644
--- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
+++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln
@@ -1,60 +1,219 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.Tests", "tests\System.IO.Pipes.Tests.csproj", "{142469EC-D665-4FE2-845A-FDA69F9CC557}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} = {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "src\System.IO.Pipes.csproj", "{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}"
-	ProjectSection(ProjectDependencies) = postProject
-		{38B2B275-FB29-45C6-9E68-9ECEBC6BD874} = {38B2B275-FB29-45C6-9E68-9ECEBC6BD874}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{17494B7E-CD64-46FF-A75B-9ED56488213F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "ref\System.IO.Pipes.csproj", "{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{FED8B31F-94BB-48AF-9A0A-03C777BD805B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "..\System.DirectoryServices.AccountManagement\ref\System.DirectoryServices.AccountManagement.csproj", "{9A567CB8-B318-42C0-B05F-B0746E50DBFD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "..\System.DirectoryServices.AccountManagement\src\System.DirectoryServices.AccountManagement.csproj", "{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CBDA9624-90C8-4236-8883-EDFA0D92C724}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\ref\System.DirectoryServices.Protocols.csproj", "{572E9C48-D5F4-4D27-825F-6BBC504E9526}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{D352661A-5F26-403B-9077-D536A57609E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{57AD446D-B3AF-4E48-AC43-01B65F590D98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{22DC3AC5-85F1-43C4-B9AA-16E9916F0890}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "ref\System.IO.Pipes.csproj", "{53D35175-9799-4535-8322-88BF2FCDD56E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes", "src\System.IO.Pipes.csproj", "{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.Tests", "tests\System.IO.Pipes.Tests.csproj", "{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D374E357-D5DA-4958-9C8B-7EA512B19BEF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DD675156-B16E-44C8-854B-AEC717FF4DE0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D148F4A7-06C8-4AE8-B0A9-1F5DE3A2EAF8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{E565DD4A-0749-4F5E-8476-EF44D742E377}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{15CB5F16-593B-460D-BDC3-134A56EF3B5F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{FC9FBADB-C525-4939-9E4E-20AB43DAF2D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{F1F93C9B-5169-40FB-A258-81EC914360EC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{724E9C4C-A140-4815-88A4-2934BD67574F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{47986042-2EFD-4FA5-B7D6-CD7316817FE0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B} = {47986042-2EFD-4FA5-B7D6-CD7316817FE0}
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC} = {47986042-2EFD-4FA5-B7D6-CD7316817FE0}
+		{17494B7E-CD64-46FF-A75B-9ED56488213F} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{D352661A-5F26-403B-9077-D536A57609E7} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{57AD446D-B3AF-4E48-AC43-01B65F590D98} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{53D35175-9799-4535-8322-88BF2FCDD56E} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{D374E357-D5DA-4958-9C8B-7EA512B19BEF} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{D148F4A7-06C8-4AE8-B0A9-1F5DE3A2EAF8} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{FC9FBADB-C525-4939-9E4E-20AB43DAF2D9} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{724E9C4C-A140-4815-88A4-2934BD67574F} = {E97ACD26-140F-408E-9B12-9FCDF7DEFDB7}
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{22DC3AC5-85F1-43C4-B9AA-16E9916F0890} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{DD675156-B16E-44C8-854B-AEC717FF4DE0} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{E565DD4A-0749-4F5E-8476-EF44D742E377} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{F1F93C9B-5169-40FB-A258-81EC914360EC} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5} = {6E5FD556-2DDB-49AB-ADE6-3DB1B844E4B5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{142469EC-D665-4FE2-845A-FDA69F9CC557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{142469EC-D665-4FE2-845A-FDA69F9CC557}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{142469EC-D665-4FE2-845A-FDA69F9CC557}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{142469EC-D665-4FE2-845A-FDA69F9CC557}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918}.Release|Any CPU.Build.0 = Release|Any CPU
-		{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{38B2B275-FB29-45C6-9E68-9ECEBC6BD874}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBDA9624-90C8-4236-8883-EDFA0D92C724}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBDA9624-90C8-4236-8883-EDFA0D92C724}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBDA9624-90C8-4236-8883-EDFA0D92C724}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBDA9624-90C8-4236-8883-EDFA0D92C724}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CF29A1C-AAE7-46E2-B1BE-40CEE7632A7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17494B7E-CD64-46FF-A75B-9ED56488213F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17494B7E-CD64-46FF-A75B-9ED56488213F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17494B7E-CD64-46FF-A75B-9ED56488213F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17494B7E-CD64-46FF-A75B-9ED56488213F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64157E8E-5D3C-4DC5-A2B5-5272DAEA83D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FED8B31F-94BB-48AF-9A0A-03C777BD805B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A567CB8-B318-42C0-B05F-B0746E50DBFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD5D3579-50B5-4ECE-AE54-2C67E66B8E09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{572E9C48-D5F4-4D27-825F-6BBC504E9526}.Release|Any CPU.Build.0 = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{826D5FBF-95C3-42EE-BACD-0CA38B6FEC73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FACB7D5-E0A4-43D4-8C61-CB0C39C8A7EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A15EED32-12DF-40D3-AA8E-197F76D8A0C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D352661A-5F26-403B-9077-D536A57609E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D352661A-5F26-403B-9077-D536A57609E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D352661A-5F26-403B-9077-D536A57609E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D352661A-5F26-403B-9077-D536A57609E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57AD446D-B3AF-4E48-AC43-01B65F590D98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57AD446D-B3AF-4E48-AC43-01B65F590D98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57AD446D-B3AF-4E48-AC43-01B65F590D98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57AD446D-B3AF-4E48-AC43-01B65F590D98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22DC3AC5-85F1-43C4-B9AA-16E9916F0890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22DC3AC5-85F1-43C4-B9AA-16E9916F0890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22DC3AC5-85F1-43C4-B9AA-16E9916F0890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22DC3AC5-85F1-43C4-B9AA-16E9916F0890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53D35175-9799-4535-8322-88BF2FCDD56E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A471AEB-FCCB-43DF-9C04-F00FA9AAF81E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF14A751-0E6D-4B99-A6FB-F295B8C5E0FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D374E357-D5DA-4958-9C8B-7EA512B19BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD675156-B16E-44C8-854B-AEC717FF4DE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD675156-B16E-44C8-854B-AEC717FF4DE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD675156-B16E-44C8-854B-AEC717FF4DE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD675156-B16E-44C8-854B-AEC717FF4DE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D148F4A7-06C8-4AE8-B0A9-1F5DE3A2EAF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D148F4A7-06C8-4AE8-B0A9-1F5DE3A2EAF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D148F4A7-06C8-4AE8-B0A9-1F5DE3A2EAF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D148F4A7-06C8-4AE8-B0A9-1F5DE3A2EAF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E285C4E-BE83-458A-84A9-3C1F8D9FAAF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25441E1F-971D-4FF3-BA5A-2FBAAC3EB9FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E565DD4A-0749-4F5E-8476-EF44D742E377}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57DABE06-F0EF-4C7A-BC0C-791A3A5F45F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15CB5F16-593B-460D-BDC3-134A56EF3B5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC9FBADB-C525-4939-9E4E-20AB43DAF2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC9FBADB-C525-4939-9E4E-20AB43DAF2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC9FBADB-C525-4939-9E4E-20AB43DAF2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC9FBADB-C525-4939-9E4E-20AB43DAF2D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1F93C9B-5169-40FB-A258-81EC914360EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1F93C9B-5169-40FB-A258-81EC914360EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1F93C9B-5169-40FB-A258-81EC914360EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1F93C9B-5169-40FB-A258-81EC914360EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{724E9C4C-A140-4815-88A4-2934BD67574F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDC3E87D-26B7-45BA-87D4-D6417D64D9E5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{142469EC-D665-4FE2-845A-FDA69F9CC557} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{38B2B275-FB29-45C6-9E68-9ECEBC6BD874} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{CBDA9624-90C8-4236-8883-EDFA0D92C724} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F531A2FC-20AC-4B49-8C87-B9D69F2F2055}
+		SolutionGuid = {CD1065BC-8D4A-4559-BC8B-8FB6B73A6B15}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.Ports/System.IO.Ports.sln b/src/libraries/System.IO.Ports/System.IO.Ports.sln
index 5b45c8ef3686a5..e29c6823e8dd80 100644
--- a/src/libraries/System.IO.Ports/System.IO.Ports.sln
+++ b/src/libraries/System.IO.Ports/System.IO.Ports.sln
@@ -1,60 +1,163 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports.Tests", "tests\System.IO.Ports.Tests.csproj", "{4259DCE9-3480-40BB-B08A-64A2D446264B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{187503F4-BEF9-4369-A1B2-E3DC5D564E4E} = {187503F4-BEF9-4369-A1B2-E3DC5D564E4E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports", "src\System.IO.Ports.csproj", "{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{75DE4259-43BB-4067-9F30-3AC920D51AEC} = {75DE4259-43BB-4067-9F30-3AC920D51AEC}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0F8658BC-7FA7-45AF-A4FB-8E1D3AAD1908}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports", "ref\System.IO.Ports.csproj", "{75DE4259-43BB-4067-9F30-3AC920D51AEC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{757F4BE8-FB81-4C83-A710-39A2D3A260FA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{FB780119-1476-4079-B4EB-62BE92D85296}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{34D1FA12-92E8-4FAB-9F50-1B068AFF3EE7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{C5AFF6A1-4979-4C86-B19F-BD1E6848644B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5D4A4B8C-7DC1-4BAA-BE24-868664E8ECCA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports", "ref\System.IO.Ports.csproj", "{5594242D-5209-4F6F-AA08-44489B5B733F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports", "src\System.IO.Ports.csproj", "{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Ports.Tests", "tests\System.IO.Ports.Tests.csproj", "{32AD9913-7FC8-499A-9712-A5128998BFDA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{78986AA5-18DB-4476-8E00-66EA8DDA8AF8}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{6684D34A-0341-484F-83EC-BA75B2A6D230}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{8450CD44-620D-46D4-A054-769A9AC1E434}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{10D1B3BC-447C-4FE4-911F-9DCF087AFDCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{4281B413-0586-452B-9152-8012BBEA6BBF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{4A8086FF-F2F3-4625-8EEE-22FB49FF7ACF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{AF080B51-C317-42B2-914D-6040C45D4E2B}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{CA68C7E7-54DD-469A-A984-0AEF1781F4DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{226F223B-4D79-42E9-A981-B174C1A00A4E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C3495454-3C91-43EE-A951-98AC2DF51479}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0B9440A3-B339-4E66-9ADC-8540AA4199BF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89B8BDA8-551A-4338-85F1-67AD28370AB4}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A3E471F9-5008-4FFC-B80D-4EF921E8CFB7} = {C3495454-3C91-43EE-A951-98AC2DF51479}
+		{32AD9913-7FC8-499A-9712-A5128998BFDA} = {C3495454-3C91-43EE-A951-98AC2DF51479}
+		{0F8658BC-7FA7-45AF-A4FB-8E1D3AAD1908} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{FB780119-1476-4079-B4EB-62BE92D85296} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{34D1FA12-92E8-4FAB-9F50-1B068AFF3EE7} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{5594242D-5209-4F6F-AA08-44489B5B733F} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{6684D34A-0341-484F-83EC-BA75B2A6D230} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{10D1B3BC-447C-4FE4-911F-9DCF087AFDCD} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{4A8086FF-F2F3-4625-8EEE-22FB49FF7ACF} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{CA68C7E7-54DD-469A-A984-0AEF1781F4DF} = {0B9440A3-B339-4E66-9ADC-8540AA4199BF}
+		{757F4BE8-FB81-4C83-A710-39A2D3A260FA} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{C5AFF6A1-4979-4C86-B19F-BD1E6848644B} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{DBB69108-6DCB-49A0-9EFE-0A26DC3E6B9E} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{7E68AD2F-437D-47A3-A68C-1286B995B33D} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{8450CD44-620D-46D4-A054-769A9AC1E434} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{4281B413-0586-452B-9152-8012BBEA6BBF} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{AF080B51-C317-42B2-914D-6040C45D4E2B} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{50120440-409D-4B8A-B54C-F5FC637EF529} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+		{226F223B-4D79-42E9-A981-B174C1A00A4E} = {89B8BDA8-551A-4338-85F1-67AD28370AB4}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4259DCE9-3480-40BB-B08A-64A2D446264B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4259DCE9-3480-40BB-B08A-64A2D446264B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4259DCE9-3480-40BB-B08A-64A2D446264B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4259DCE9-3480-40BB-B08A-64A2D446264B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{187503F4-BEF9-4369-A1B2-E3DC5D564E4E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75DE4259-43BB-4067-9F30-3AC920D51AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75DE4259-43BB-4067-9F30-3AC920D51AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75DE4259-43BB-4067-9F30-3AC920D51AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75DE4259-43BB-4067-9F30-3AC920D51AEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D4A4B8C-7DC1-4BAA-BE24-868664E8ECCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D4A4B8C-7DC1-4BAA-BE24-868664E8ECCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D4A4B8C-7DC1-4BAA-BE24-868664E8ECCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D4A4B8C-7DC1-4BAA-BE24-868664E8ECCA}.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
+		{0F8658BC-7FA7-45AF-A4FB-8E1D3AAD1908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F8658BC-7FA7-45AF-A4FB-8E1D3AAD1908}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F8658BC-7FA7-45AF-A4FB-8E1D3AAD1908}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F8658BC-7FA7-45AF-A4FB-8E1D3AAD1908}.Release|Any CPU.Build.0 = Release|Any CPU
+		{757F4BE8-FB81-4C83-A710-39A2D3A260FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{757F4BE8-FB81-4C83-A710-39A2D3A260FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{757F4BE8-FB81-4C83-A710-39A2D3A260FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{757F4BE8-FB81-4C83-A710-39A2D3A260FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB780119-1476-4079-B4EB-62BE92D85296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB780119-1476-4079-B4EB-62BE92D85296}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB780119-1476-4079-B4EB-62BE92D85296}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB780119-1476-4079-B4EB-62BE92D85296}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34D1FA12-92E8-4FAB-9F50-1B068AFF3EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34D1FA12-92E8-4FAB-9F50-1B068AFF3EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34D1FA12-92E8-4FAB-9F50-1B068AFF3EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34D1FA12-92E8-4FAB-9F50-1B068AFF3EE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5AFF6A1-4979-4C86-B19F-BD1E6848644B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5AFF6A1-4979-4C86-B19F-BD1E6848644B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5AFF6A1-4979-4C86-B19F-BD1E6848644B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5AFF6A1-4979-4C86-B19F-BD1E6848644B}.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
+		{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
+		{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
+		{78986AA5-18DB-4476-8E00-66EA8DDA8AF8}.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
+		{6684D34A-0341-484F-83EC-BA75B2A6D230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6684D34A-0341-484F-83EC-BA75B2A6D230}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6684D34A-0341-484F-83EC-BA75B2A6D230}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6684D34A-0341-484F-83EC-BA75B2A6D230}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8450CD44-620D-46D4-A054-769A9AC1E434}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8450CD44-620D-46D4-A054-769A9AC1E434}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8450CD44-620D-46D4-A054-769A9AC1E434}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8450CD44-620D-46D4-A054-769A9AC1E434}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10D1B3BC-447C-4FE4-911F-9DCF087AFDCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10D1B3BC-447C-4FE4-911F-9DCF087AFDCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10D1B3BC-447C-4FE4-911F-9DCF087AFDCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10D1B3BC-447C-4FE4-911F-9DCF087AFDCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4281B413-0586-452B-9152-8012BBEA6BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4281B413-0586-452B-9152-8012BBEA6BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4281B413-0586-452B-9152-8012BBEA6BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4281B413-0586-452B-9152-8012BBEA6BBF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A8086FF-F2F3-4625-8EEE-22FB49FF7ACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A8086FF-F2F3-4625-8EEE-22FB49FF7ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A8086FF-F2F3-4625-8EEE-22FB49FF7ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A8086FF-F2F3-4625-8EEE-22FB49FF7ACF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF080B51-C317-42B2-914D-6040C45D4E2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF080B51-C317-42B2-914D-6040C45D4E2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF080B51-C317-42B2-914D-6040C45D4E2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF080B51-C317-42B2-914D-6040C45D4E2B}.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
+		{CA68C7E7-54DD-469A-A984-0AEF1781F4DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA68C7E7-54DD-469A-A984-0AEF1781F4DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA68C7E7-54DD-469A-A984-0AEF1781F4DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA68C7E7-54DD-469A-A984-0AEF1781F4DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{226F223B-4D79-42E9-A981-B174C1A00A4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{226F223B-4D79-42E9-A981-B174C1A00A4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{226F223B-4D79-42E9-A981-B174C1A00A4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{226F223B-4D79-42E9-A981-B174C1A00A4E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4259DCE9-3480-40BB-B08A-64A2D446264B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{187503F4-BEF9-4369-A1B2-E3DC5D564E4E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{75DE4259-43BB-4067-9F30-3AC920D51AEC} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{5D4A4B8C-7DC1-4BAA-BE24-868664E8ECCA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6245C4C2-9217-41E3-A9FA-8118DA599D2B}
+		SolutionGuid = {54136FEA-7C5B-41E5-86EE-C5816F222DEE}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
index 95f5952e3ea25b..8fe751b8ace350 100644
--- a/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
+++ b/src/libraries/System.IO.UnmanagedMemoryStream/System.IO.UnmanagedMemoryStream.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream.Tests", "tests\System.IO.UnmanagedMemoryStream.Tests.csproj", "{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BCF9255A-4321-4277-AD7D-F5094092C554} = {BCF9255A-4321-4277-AD7D-F5094092C554}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{074D8726-9CC3-43B5-9D28-1AD33A6100F7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream", "src\System.IO.UnmanagedMemoryStream.csproj", "{BCF9255A-4321-4277-AD7D-F5094092C554}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C2D9E102-8E1D-4942-BA72-A55B152A5D0E} = {C2D9E102-8E1D-4942-BA72-A55B152A5D0E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream", "ref\System.IO.UnmanagedMemoryStream.csproj", "{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{393BED6B-E473-4F7B-AD8C-3FA46327B09E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream", "ref\System.IO.UnmanagedMemoryStream.csproj", "{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream", "src\System.IO.UnmanagedMemoryStream.csproj", "{658B1534-3B9E-4108-9AFE-161562723E9D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.UnmanagedMemoryStream.Tests", "tests\System.IO.UnmanagedMemoryStream.Tests.csproj", "{D14DC8D4-F45E-412D-AE98-CA07F900347B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{90EE22E9-504E-4CC3-BF8A-F08515FCD8C6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D7A11210-8298-43E5-B414-3019CC7E1A79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B890249B-B590-4323-B1F6-0C1AB8E02D68}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E93BBBCD-CE36-4375-BE87-5958364BC773}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4FF595B2-380D-4E4E-9323-919879B92415}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1C319AEF-D516-48F5-8F90-E52AA14E5ECA}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7} = {E93BBBCD-CE36-4375-BE87-5958364BC773}
+		{658B1534-3B9E-4108-9AFE-161562723E9D} = {E93BBBCD-CE36-4375-BE87-5958364BC773}
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68} = {E93BBBCD-CE36-4375-BE87-5958364BC773}
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E} = {4FF595B2-380D-4E4E-9323-919879B92415}
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B} = {4FF595B2-380D-4E4E-9323-919879B92415}
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E} = {1C319AEF-D516-48F5-8F90-E52AA14E5ECA}
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F} = {1C319AEF-D516-48F5-8F90-E52AA14E5ECA}
+		{D7A11210-8298-43E5-B414-3019CC7E1A79} = {1C319AEF-D516-48F5-8F90-E52AA14E5ECA}
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368} = {1C319AEF-D516-48F5-8F90-E52AA14E5ECA}
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F} = {1C319AEF-D516-48F5-8F90-E52AA14E5ECA}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55F26FB1-D4AF-48CA-A470-83113AE7BFDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BCF9255A-4321-4277-AD7D-F5094092C554}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BCF9255A-4321-4277-AD7D-F5094092C554}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2D9E102-8E1D-4942-BA72-A55B152A5D0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90EE22E9-504E-4CC3-BF8A-F08515FCD8C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90EE22E9-504E-4CC3-BF8A-F08515FCD8C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90EE22E9-504E-4CC3-BF8A-F08515FCD8C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90EE22E9-504E-4CC3-BF8A-F08515FCD8C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Debug|Any CPU.Build.0 = Debug|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Debug|x64.ActiveCfg = Debug|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Debug|x64.Build.0 = Debug|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Debug|x86.ActiveCfg = Debug|x86
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Debug|x86.Build.0 = Debug|x86
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Release|Any CPU.ActiveCfg = Release|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Release|Any CPU.Build.0 = Release|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Release|x64.ActiveCfg = Release|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Release|x64.Build.0 = Release|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Release|x86.ActiveCfg = Release|x86
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Release|x86.Build.0 = Release|x86
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Checked|Any CPU.Build.0 = Checked|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Checked|x64.ActiveCfg = Checked|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Checked|x64.Build.0 = Checked|x64
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Checked|x86.ActiveCfg = Checked|x86
+		{074D8726-9CC3-43B5-9D28-1AD33A6100F7}.Checked|x86.Build.0 = Checked|x86
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Debug|x64.Build.0 = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Release|x64.ActiveCfg = Release|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Release|x64.Build.0 = Release|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Release|x86.Build.0 = Release|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7DC8F0E9-5D6C-47F7-AE83-9AB1180AF51E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Debug|x64.Build.0 = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Debug|x86.Build.0 = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Release|x64.ActiveCfg = Release|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Release|x64.Build.0 = Release|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Release|x86.ActiveCfg = Release|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Release|x86.Build.0 = Release|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{393BED6B-E473-4F7B-AD8C-3FA46327B09E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Release|x64.Build.0 = Release|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Release|x86.Build.0 = Release|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9ED000E5-2F8D-4B49-85BD-70E34AB2A26F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Debug|x64.Build.0 = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Debug|x86.Build.0 = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Release|x64.ActiveCfg = Release|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Release|x64.Build.0 = Release|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Release|x86.ActiveCfg = Release|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Release|x86.Build.0 = Release|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{658B1534-3B9E-4108-9AFE-161562723E9D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Debug|x64.Build.0 = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Debug|x86.Build.0 = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Release|x64.ActiveCfg = Release|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Release|x64.Build.0 = Release|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Release|x86.ActiveCfg = Release|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Release|x86.Build.0 = Release|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D14DC8D4-F45E-412D-AE98-CA07F900347B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Debug|x86.Build.0 = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x64.Build.0 = Release|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Release|x86.Build.0 = Release|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D7A11210-8298-43E5-B414-3019CC7E1A79}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x64.Build.0 = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Debug|x86.Build.0 = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x64.ActiveCfg = Release|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x64.Build.0 = Release|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x86.ActiveCfg = Release|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Release|x86.Build.0 = Release|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B890249B-B590-4323-B1F6-0C1AB8E02D68}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Debug|x64.Build.0 = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Debug|x86.Build.0 = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Release|x64.ActiveCfg = Release|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Release|x64.Build.0 = Release|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Release|x86.ActiveCfg = Release|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Release|x86.Build.0 = Release|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8B05F6AF-E8A3-4A60-9EC1-90447B02A368}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Debug|x64.Build.0 = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Debug|x86.Build.0 = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Release|x64.ActiveCfg = Release|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Release|x64.Build.0 = Release|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Release|x86.ActiveCfg = Release|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Release|x86.Build.0 = Release|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5FA5C83E-7DF5-4596-A5F8-DC7C8E7EE05F}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{55F26FB1-D4AF-48CA-A470-83113AE7BFDB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BCF9255A-4321-4277-AD7D-F5094092C554} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C2D9E102-8E1D-4942-BA72-A55B152A5D0E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{90EE22E9-504E-4CC3-BF8A-F08515FCD8C6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9E1FBBA6-089F-4262-ACA7-F928D3CB379C}
+		SolutionGuid = {819EC888-7F7A-4501-AC44-653366DC0DB8}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.IO/System.IO.sln b/src/libraries/System.IO/System.IO.sln
index 061a9f392d2a79..fa248eb5af8221 100644
--- a/src/libraries/System.IO/System.IO.sln
+++ b/src/libraries/System.IO/System.IO.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Tests", "tests\System.IO.Tests.csproj", "{BC2E1649-291D-412E-9529-EDDA94FA7AD6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D11D3624-1322-45D1-A604-7E68CDB85BE8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO", "src\System.IO.csproj", "{5471BFE8-8071-466F-838E-5ADAA779E742}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {4ADD9456-A929-4254-B8A2-16FC628ABFDA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B96C7401-C6F9-447A-B95B-879CA5C7B982}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO", "ref\System.IO.csproj", "{4ADD9456-A929-4254-B8A2-16FC628ABFDA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO", "ref\System.IO.csproj", "{CB000FA4-3F31-4695-B221-60D59BEC0A5E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO", "src\System.IO.csproj", "{0769544B-1A5D-4D74-94FD-899DF6C39D62}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Tests", "tests\System.IO.Tests.csproj", "{72923407-7B7B-44A8-BCA6-2DB562835A8F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{602525FF-EE47-4938-8979-32DC962109E4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{55332A79-1F66-4557-98D7-7583A70E69E0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{AA5E80B2-A0AA-46F1-B319-5B528BAC382B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{0308343D-9E8A-42C8-8456-7BA3A6F3BE3B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D0D1CDAC-16F8-4382-A219-74A513CC1790}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5AD2C433-C661-4AD1-BD9F-D164ADC43512}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9FDAA57A-696B-4CB1-99AE-BCDF91848B75}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D9FD8082-D04C-4DA8-9F4C-261D1C65A6D3}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D11D3624-1322-45D1-A604-7E68CDB85BE8} = {5AD2C433-C661-4AD1-BD9F-D164ADC43512}
+		{72923407-7B7B-44A8-BCA6-2DB562835A8F} = {5AD2C433-C661-4AD1-BD9F-D164ADC43512}
+		{B96C7401-C6F9-447A-B95B-879CA5C7B982} = {9FDAA57A-696B-4CB1-99AE-BCDF91848B75}
+		{CB000FA4-3F31-4695-B221-60D59BEC0A5E} = {9FDAA57A-696B-4CB1-99AE-BCDF91848B75}
+		{602525FF-EE47-4938-8979-32DC962109E4} = {9FDAA57A-696B-4CB1-99AE-BCDF91848B75}
+		{0308343D-9E8A-42C8-8456-7BA3A6F3BE3B} = {9FDAA57A-696B-4CB1-99AE-BCDF91848B75}
+		{D0D1CDAC-16F8-4382-A219-74A513CC1790} = {9FDAA57A-696B-4CB1-99AE-BCDF91848B75}
+		{0769544B-1A5D-4D74-94FD-899DF6C39D62} = {D9FD8082-D04C-4DA8-9F4C-261D1C65A6D3}
+		{AA5E80B2-A0AA-46F1-B319-5B528BAC382B} = {D9FD8082-D04C-4DA8-9F4C-261D1C65A6D3}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5471BFE8-8071-466F-838E-5ADAA779E742}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55332A79-1F66-4557-98D7-7583A70E69E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55332A79-1F66-4557-98D7-7583A70E69E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55332A79-1F66-4557-98D7-7583A70E69E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55332A79-1F66-4557-98D7-7583A70E69E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D11D3624-1322-45D1-A604-7E68CDB85BE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D11D3624-1322-45D1-A604-7E68CDB85BE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D11D3624-1322-45D1-A604-7E68CDB85BE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D11D3624-1322-45D1-A604-7E68CDB85BE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B96C7401-C6F9-447A-B95B-879CA5C7B982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B96C7401-C6F9-447A-B95B-879CA5C7B982}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B96C7401-C6F9-447A-B95B-879CA5C7B982}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B96C7401-C6F9-447A-B95B-879CA5C7B982}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB000FA4-3F31-4695-B221-60D59BEC0A5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB000FA4-3F31-4695-B221-60D59BEC0A5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB000FA4-3F31-4695-B221-60D59BEC0A5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB000FA4-3F31-4695-B221-60D59BEC0A5E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0769544B-1A5D-4D74-94FD-899DF6C39D62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0769544B-1A5D-4D74-94FD-899DF6C39D62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0769544B-1A5D-4D74-94FD-899DF6C39D62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0769544B-1A5D-4D74-94FD-899DF6C39D62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72923407-7B7B-44A8-BCA6-2DB562835A8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{602525FF-EE47-4938-8979-32DC962109E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{602525FF-EE47-4938-8979-32DC962109E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{602525FF-EE47-4938-8979-32DC962109E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{602525FF-EE47-4938-8979-32DC962109E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA5E80B2-A0AA-46F1-B319-5B528BAC382B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0308343D-9E8A-42C8-8456-7BA3A6F3BE3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0308343D-9E8A-42C8-8456-7BA3A6F3BE3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0308343D-9E8A-42C8-8456-7BA3A6F3BE3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0308343D-9E8A-42C8-8456-7BA3A6F3BE3B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0D1CDAC-16F8-4382-A219-74A513CC1790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0D1CDAC-16F8-4382-A219-74A513CC1790}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0D1CDAC-16F8-4382-A219-74A513CC1790}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0D1CDAC-16F8-4382-A219-74A513CC1790}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{BC2E1649-291D-412E-9529-EDDA94FA7AD6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5471BFE8-8071-466F-838E-5ADAA779E742} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4ADD9456-A929-4254-B8A2-16FC628ABFDA} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{55332A79-1F66-4557-98D7-7583A70E69E0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E6964E6C-E54F-4BA8-A2C5-941226478E2C}
+		SolutionGuid = {C3EF571A-C18D-483F-9EFC-CDB71C73548E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
index dec4080838210c..ca4edd1913dc51 100644
--- a/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
+++ b/src/libraries/System.Linq.Expressions/System.Linq.Expressions.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions.Tests", "tests\System.Linq.Expressions.Tests.csproj", "{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787} = {AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8E74EBBC-51CD-4D60-A560-B7A97CB3D388}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions", "src\System.Linq.Expressions.csproj", "{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}"
-	ProjectSection(ProjectDependencies) = postProject
-		{33B6ACE2-0B53-4054-8BF6-482F9E0E9427} = {33B6ACE2-0B53-4054-8BF6-482F9E0E9427}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{748BBF35-2377-4BBA-B496-5A6699CF2F9D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions", "ref\System.Linq.Expressions.csproj", "{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions", "ref\System.Linq.Expressions.csproj", "{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions", "src\System.Linq.Expressions.csproj", "{1312B533-04ED-4268-8DAF-A7C69BC870A4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Expressions.Tests", "tests\System.Linq.Expressions.Tests.csproj", "{CAFF697E-0A65-49BA-9902-79D7D3B00326}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7A587E5E-D061-419C-AB5C-EC15243D5AC1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4E9A4CF1-81A5-4876-B23A-7B3CE8AF99A2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{6FF12D47-9E45-48BD-9864-1D3CC2B7DF28}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{113A39A7-DD13-4AED-8573-3F27C171B8EB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C1FC019-C0DE-42FC-B344-EFCC2C8A4692}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{106F102E-304B-4B9B-9602-D918D28A683A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE6BDBA3-B3E0-4D1F-8E38-1C9C502AB179}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8E74EBBC-51CD-4D60-A560-B7A97CB3D388} = {6C1FC019-C0DE-42FC-B344-EFCC2C8A4692}
+		{CAFF697E-0A65-49BA-9902-79D7D3B00326} = {6C1FC019-C0DE-42FC-B344-EFCC2C8A4692}
+		{748BBF35-2377-4BBA-B496-5A6699CF2F9D} = {106F102E-304B-4B9B-9602-D918D28A683A}
+		{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7} = {106F102E-304B-4B9B-9602-D918D28A683A}
+		{7A587E5E-D061-419C-AB5C-EC15243D5AC1} = {106F102E-304B-4B9B-9602-D918D28A683A}
+		{6FF12D47-9E45-48BD-9864-1D3CC2B7DF28} = {106F102E-304B-4B9B-9602-D918D28A683A}
+		{113A39A7-DD13-4AED-8573-3F27C171B8EB} = {106F102E-304B-4B9B-9602-D918D28A683A}
+		{1312B533-04ED-4268-8DAF-A7C69BC870A4} = {BE6BDBA3-B3E0-4D1F-8E38-1C9C502AB179}
+		{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33} = {BE6BDBA3-B3E0-4D1F-8E38-1C9C502AB179}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33B6ACE2-0B53-4054-8BF6-482F9E0E9427}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4E9A4CF1-81A5-4876-B23A-7B3CE8AF99A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4E9A4CF1-81A5-4876-B23A-7B3CE8AF99A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4E9A4CF1-81A5-4876-B23A-7B3CE8AF99A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4E9A4CF1-81A5-4876-B23A-7B3CE8AF99A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E74EBBC-51CD-4D60-A560-B7A97CB3D388}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E74EBBC-51CD-4D60-A560-B7A97CB3D388}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E74EBBC-51CD-4D60-A560-B7A97CB3D388}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E74EBBC-51CD-4D60-A560-B7A97CB3D388}.Release|Any CPU.Build.0 = Release|Any CPU
+		{748BBF35-2377-4BBA-B496-5A6699CF2F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{748BBF35-2377-4BBA-B496-5A6699CF2F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{748BBF35-2377-4BBA-B496-5A6699CF2F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{748BBF35-2377-4BBA-B496-5A6699CF2F9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3817B5F-98D8-4BE8-8C00-0C166EFBC2B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1312B533-04ED-4268-8DAF-A7C69BC870A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1312B533-04ED-4268-8DAF-A7C69BC870A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1312B533-04ED-4268-8DAF-A7C69BC870A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1312B533-04ED-4268-8DAF-A7C69BC870A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CAFF697E-0A65-49BA-9902-79D7D3B00326}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A587E5E-D061-419C-AB5C-EC15243D5AC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F4AAFD2-64AD-4E84-821D-A3DAC415EB33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FF12D47-9E45-48BD-9864-1D3CC2B7DF28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FF12D47-9E45-48BD-9864-1D3CC2B7DF28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FF12D47-9E45-48BD-9864-1D3CC2B7DF28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FF12D47-9E45-48BD-9864-1D3CC2B7DF28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{113A39A7-DD13-4AED-8573-3F27C171B8EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{113A39A7-DD13-4AED-8573-3F27C171B8EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{113A39A7-DD13-4AED-8573-3F27C171B8EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{113A39A7-DD13-4AED-8573-3F27C171B8EB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4B4AA59B-89F9-4A34-B3C3-C97EF531EE00} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AEF718E9-D4FC-418F-A7AE-ED6B2C7B3787} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{33B6ACE2-0B53-4054-8BF6-482F9E0E9427} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{4E9A4CF1-81A5-4876-B23A-7B3CE8AF99A2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5D603D7D-D3BB-4FC0-8AEE-E3F4B0526975}
+		SolutionGuid = {AF9218A4-1E73-408C-BEF5-0300BD9DDEB0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
index c578e19ea0dcb5..594adf74e9ee55 100644
--- a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
+++ b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel.Tests", "tests\System.Linq.Parallel.Tests.csproj", "{A7074928-82C3-4739-88FE-9B528977950C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} = {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FEAB4813-8FCB-4B06-8CA1-7743EA517F97}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel", "src\System.Linq.Parallel.csproj", "{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{670405FE-3828-436E-A668-A0F0B88B57A4} = {670405FE-3828-436E-A668-A0F0B88B57A4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9EE9A9E0-2E35-4231-AF1F-6E720D84D332}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel", "ref\System.Linq.Parallel.csproj", "{670405FE-3828-436E-A668-A0F0B88B57A4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel", "ref\System.Linq.Parallel.csproj", "{6201BF54-B81C-456D-BF3E-46C3404E720E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel", "src\System.Linq.Parallel.csproj", "{CDF79D0D-248D-48A5-A698-00D34FBA64E1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel.Tests", "tests\System.Linq.Parallel.Tests.csproj", "{0B9B4D1C-998E-4323-84E9-02400EFFBC05}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E5C01929-0B7E-46D0-9F93-8C61BD619601}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CCA17684-51B3-44EF-A369-FE4B439E9F36}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1D74FA0C-9114-45B7-985C-E81B9A367931}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{4DE5AA83-68F0-482E-96BB-AA1B0E42D0F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B885FA51-5CE4-43BF-845A-BA70DB91F864}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8A7C63F8-EBE3-4ECF-BAAA-2C390A623493}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0176FFAC-555D-47C6-9E39-596405537EBE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A8E315E-74CC-46B4-9F02-2727619CDE00}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{FEAB4813-8FCB-4B06-8CA1-7743EA517F97} = {8A7C63F8-EBE3-4ECF-BAAA-2C390A623493}
+		{0B9B4D1C-998E-4323-84E9-02400EFFBC05} = {8A7C63F8-EBE3-4ECF-BAAA-2C390A623493}
+		{9EE9A9E0-2E35-4231-AF1F-6E720D84D332} = {0176FFAC-555D-47C6-9E39-596405537EBE}
+		{6201BF54-B81C-456D-BF3E-46C3404E720E} = {0176FFAC-555D-47C6-9E39-596405537EBE}
+		{E5C01929-0B7E-46D0-9F93-8C61BD619601} = {0176FFAC-555D-47C6-9E39-596405537EBE}
+		{4DE5AA83-68F0-482E-96BB-AA1B0E42D0F0} = {0176FFAC-555D-47C6-9E39-596405537EBE}
+		{B885FA51-5CE4-43BF-845A-BA70DB91F864} = {0176FFAC-555D-47C6-9E39-596405537EBE}
+		{CDF79D0D-248D-48A5-A698-00D34FBA64E1} = {3A8E315E-74CC-46B4-9F02-2727619CDE00}
+		{1D74FA0C-9114-45B7-985C-E81B9A367931} = {3A8E315E-74CC-46B4-9F02-2727619CDE00}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7074928-82C3-4739-88FE-9B528977950C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7074928-82C3-4739-88FE-9B528977950C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{670405FE-3828-436E-A668-A0F0B88B57A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{670405FE-3828-436E-A668-A0F0B88B57A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{670405FE-3828-436E-A668-A0F0B88B57A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{670405FE-3828-436E-A668-A0F0B88B57A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCA17684-51B3-44EF-A369-FE4B439E9F36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCA17684-51B3-44EF-A369-FE4B439E9F36}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCA17684-51B3-44EF-A369-FE4B439E9F36}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCA17684-51B3-44EF-A369-FE4B439E9F36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEAB4813-8FCB-4B06-8CA1-7743EA517F97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEAB4813-8FCB-4B06-8CA1-7743EA517F97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEAB4813-8FCB-4B06-8CA1-7743EA517F97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEAB4813-8FCB-4B06-8CA1-7743EA517F97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EE9A9E0-2E35-4231-AF1F-6E720D84D332}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EE9A9E0-2E35-4231-AF1F-6E720D84D332}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EE9A9E0-2E35-4231-AF1F-6E720D84D332}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EE9A9E0-2E35-4231-AF1F-6E720D84D332}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6201BF54-B81C-456D-BF3E-46C3404E720E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6201BF54-B81C-456D-BF3E-46C3404E720E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6201BF54-B81C-456D-BF3E-46C3404E720E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6201BF54-B81C-456D-BF3E-46C3404E720E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDF79D0D-248D-48A5-A698-00D34FBA64E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDF79D0D-248D-48A5-A698-00D34FBA64E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDF79D0D-248D-48A5-A698-00D34FBA64E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDF79D0D-248D-48A5-A698-00D34FBA64E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B9B4D1C-998E-4323-84E9-02400EFFBC05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5C01929-0B7E-46D0-9F93-8C61BD619601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5C01929-0B7E-46D0-9F93-8C61BD619601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5C01929-0B7E-46D0-9F93-8C61BD619601}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5C01929-0B7E-46D0-9F93-8C61BD619601}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D74FA0C-9114-45B7-985C-E81B9A367931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D74FA0C-9114-45B7-985C-E81B9A367931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D74FA0C-9114-45B7-985C-E81B9A367931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D74FA0C-9114-45B7-985C-E81B9A367931}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DE5AA83-68F0-482E-96BB-AA1B0E42D0F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DE5AA83-68F0-482E-96BB-AA1B0E42D0F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DE5AA83-68F0-482E-96BB-AA1B0E42D0F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DE5AA83-68F0-482E-96BB-AA1B0E42D0F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B885FA51-5CE4-43BF-845A-BA70DB91F864}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B885FA51-5CE4-43BF-845A-BA70DB91F864}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B885FA51-5CE4-43BF-845A-BA70DB91F864}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B885FA51-5CE4-43BF-845A-BA70DB91F864}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A7074928-82C3-4739-88FE-9B528977950C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{670405FE-3828-436E-A668-A0F0B88B57A4} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{CCA17684-51B3-44EF-A369-FE4B439E9F36} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CB4C5E0B-9F5A-494C-B631-D4921B68AFCC}
+		SolutionGuid = {872BA41A-3769-426E-AB70-515BC1724FC0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
index 9d1d07ed6875be..1c6361f517caa6 100644
--- a/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
+++ b/src/libraries/System.Linq.Queryable/System.Linq.Queryable.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable.Tests", "tests\System.Linq.Queryable.Tests.csproj", "{7B88D79B-B799-4116-A7D0-AED572540CD4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BE12B753-C130-4B68-86E3-877F1AEE52C0} = {BE12B753-C130-4B68-86E3-877F1AEE52C0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{51EBF7EB-BE6B-4141-89A6-7F069CFF7E46}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable", "src\System.Linq.Queryable.csproj", "{BE12B753-C130-4B68-86E3-877F1AEE52C0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB} = {61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{63F57A63-361E-48ED-93B8-3916E69FB504}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable", "ref\System.Linq.Queryable.csproj", "{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable", "ref\System.Linq.Queryable.csproj", "{3C8FC554-3184-46F3-9AFC-C11507020B5F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable", "src\System.Linq.Queryable.csproj", "{EC9BDC43-2701-4942-AFAC-FED0555B60C9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Queryable.Tests", "tests\System.Linq.Queryable.Tests.csproj", "{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9F5939EC-E5D9-4330-922C-C6BC297AF2D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F8489E40-A57F-484B-AF45-BDEAC122E1D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1A65D35D-A006-4DAF-AC24-43925BED798F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{7BC3BABD-F858-4C89-9D91-F5B5E93CAF33}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D4432745-DF32-404C-9C71-C28A2D676120}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BA64A575-4A84-42D2-B67E-24FB8B0808E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9BB73014-B612-4DB8-ACE0-04C2B320A3A4}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{51EBF7EB-BE6B-4141-89A6-7F069CFF7E46} = {D4432745-DF32-404C-9C71-C28A2D676120}
+		{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E} = {D4432745-DF32-404C-9C71-C28A2D676120}
+		{63F57A63-361E-48ED-93B8-3916E69FB504} = {BA64A575-4A84-42D2-B67E-24FB8B0808E2}
+		{3C8FC554-3184-46F3-9AFC-C11507020B5F} = {BA64A575-4A84-42D2-B67E-24FB8B0808E2}
+		{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E} = {BA64A575-4A84-42D2-B67E-24FB8B0808E2}
+		{1A65D35D-A006-4DAF-AC24-43925BED798F} = {BA64A575-4A84-42D2-B67E-24FB8B0808E2}
+		{7BC3BABD-F858-4C89-9D91-F5B5E93CAF33} = {BA64A575-4A84-42D2-B67E-24FB8B0808E2}
+		{EC9BDC43-2701-4942-AFAC-FED0555B60C9} = {9BB73014-B612-4DB8-ACE0-04C2B320A3A4}
+		{F8489E40-A57F-484B-AF45-BDEAC122E1D0} = {9BB73014-B612-4DB8-ACE0-04C2B320A3A4}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B88D79B-B799-4116-A7D0-AED572540CD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B88D79B-B799-4116-A7D0-AED572540CD4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE12B753-C130-4B68-86E3-877F1AEE52C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE12B753-C130-4B68-86E3-877F1AEE52C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F5939EC-E5D9-4330-922C-C6BC297AF2D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F5939EC-E5D9-4330-922C-C6BC297AF2D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F5939EC-E5D9-4330-922C-C6BC297AF2D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F5939EC-E5D9-4330-922C-C6BC297AF2D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51EBF7EB-BE6B-4141-89A6-7F069CFF7E46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51EBF7EB-BE6B-4141-89A6-7F069CFF7E46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51EBF7EB-BE6B-4141-89A6-7F069CFF7E46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51EBF7EB-BE6B-4141-89A6-7F069CFF7E46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63F57A63-361E-48ED-93B8-3916E69FB504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63F57A63-361E-48ED-93B8-3916E69FB504}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63F57A63-361E-48ED-93B8-3916E69FB504}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63F57A63-361E-48ED-93B8-3916E69FB504}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C8FC554-3184-46F3-9AFC-C11507020B5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C8FC554-3184-46F3-9AFC-C11507020B5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C8FC554-3184-46F3-9AFC-C11507020B5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C8FC554-3184-46F3-9AFC-C11507020B5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC9BDC43-2701-4942-AFAC-FED0555B60C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC9BDC43-2701-4942-AFAC-FED0555B60C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC9BDC43-2701-4942-AFAC-FED0555B60C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC9BDC43-2701-4942-AFAC-FED0555B60C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{40A8D49D-B8A3-4780-84D0-C6DBF37BF91E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{975DC1AB-9FE0-40A8-9D7F-14FB69F1D17E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8489E40-A57F-484B-AF45-BDEAC122E1D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A65D35D-A006-4DAF-AC24-43925BED798F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A65D35D-A006-4DAF-AC24-43925BED798F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A65D35D-A006-4DAF-AC24-43925BED798F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A65D35D-A006-4DAF-AC24-43925BED798F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BC3BABD-F858-4C89-9D91-F5B5E93CAF33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BC3BABD-F858-4C89-9D91-F5B5E93CAF33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BC3BABD-F858-4C89-9D91-F5B5E93CAF33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BC3BABD-F858-4C89-9D91-F5B5E93CAF33}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7B88D79B-B799-4116-A7D0-AED572540CD4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BE12B753-C130-4B68-86E3-877F1AEE52C0} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{61C35AD0-AC18-44C4-A63C-BBCE2C75C0BB} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9F5939EC-E5D9-4330-922C-C6BC297AF2D7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {78DFDD37-5C9A-4B27-933B-72BED51D7743}
+		SolutionGuid = {EF81B838-4913-4654-BE99-E88F7656DE81}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Linq/System.Linq.sln b/src/libraries/System.Linq/System.Linq.sln
index 8577d4ab5cf17c..8643244fc6d52d 100644
--- a/src/libraries/System.Linq/System.Linq.sln
+++ b/src/libraries/System.Linq/System.Linq.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Tests", "tests\System.Linq.Tests.csproj", "{7C70BB15-870B-4946-8098-625DACD645A6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} = {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{AF1B1B01-A4EC-45F4-AE51-CC1FA7892181}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq", "src\System.Linq.csproj", "{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81} = {E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E5F5B9CF-770F-438A-9595-7CF25F08C648}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq", "ref\System.Linq.csproj", "{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq", "ref\System.Linq.csproj", "{7E4C1F09-B4F2-470E-9E7B-2C386E93D657}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq", "src\System.Linq.csproj", "{14B966BB-CE23-4432-ADBB-89974389AC1D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Tests", "tests\System.Linq.Tests.csproj", "{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8CC68C91-F169-4EAF-8DDA-963CD883B415}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6EF5B962-4321-4D67-A560-E82B739AEAF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CC926427-E13D-4C13-9FE8-9F4C048623B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{889F50AF-92F7-4076-9E76-0E3F1E7B7DFC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BE321AE5-D1E7-4E44-A961-702FD1CE4A45}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F7E8A1CD-9690-4DD6-9A11-945F5E1C6631}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2B45D427-3B70-47ED-A35D-1E329C687995}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{AF1B1B01-A4EC-45F4-AE51-CC1FA7892181} = {BE321AE5-D1E7-4E44-A961-702FD1CE4A45}
+		{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3} = {BE321AE5-D1E7-4E44-A961-702FD1CE4A45}
+		{E5F5B9CF-770F-438A-9595-7CF25F08C648} = {F7E8A1CD-9690-4DD6-9A11-945F5E1C6631}
+		{7E4C1F09-B4F2-470E-9E7B-2C386E93D657} = {F7E8A1CD-9690-4DD6-9A11-945F5E1C6631}
+		{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53} = {F7E8A1CD-9690-4DD6-9A11-945F5E1C6631}
+		{CC926427-E13D-4C13-9FE8-9F4C048623B7} = {F7E8A1CD-9690-4DD6-9A11-945F5E1C6631}
+		{889F50AF-92F7-4076-9E76-0E3F1E7B7DFC} = {F7E8A1CD-9690-4DD6-9A11-945F5E1C6631}
+		{14B966BB-CE23-4432-ADBB-89974389AC1D} = {2B45D427-3B70-47ED-A35D-1E329C687995}
+		{6EF5B962-4321-4D67-A560-E82B739AEAF4} = {2B45D427-3B70-47ED-A35D-1E329C687995}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7C70BB15-870B-4946-8098-625DACD645A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C70BB15-870B-4946-8098-625DACD645A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C70BB15-870B-4946-8098-625DACD645A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C70BB15-870B-4946-8098-625DACD645A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CC68C91-F169-4EAF-8DDA-963CD883B415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CC68C91-F169-4EAF-8DDA-963CD883B415}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CC68C91-F169-4EAF-8DDA-963CD883B415}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CC68C91-F169-4EAF-8DDA-963CD883B415}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF1B1B01-A4EC-45F4-AE51-CC1FA7892181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF1B1B01-A4EC-45F4-AE51-CC1FA7892181}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF1B1B01-A4EC-45F4-AE51-CC1FA7892181}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF1B1B01-A4EC-45F4-AE51-CC1FA7892181}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5F5B9CF-770F-438A-9595-7CF25F08C648}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5F5B9CF-770F-438A-9595-7CF25F08C648}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5F5B9CF-770F-438A-9595-7CF25F08C648}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5F5B9CF-770F-438A-9595-7CF25F08C648}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E4C1F09-B4F2-470E-9E7B-2C386E93D657}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E4C1F09-B4F2-470E-9E7B-2C386E93D657}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E4C1F09-B4F2-470E-9E7B-2C386E93D657}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E4C1F09-B4F2-470E-9E7B-2C386E93D657}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14B966BB-CE23-4432-ADBB-89974389AC1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14B966BB-CE23-4432-ADBB-89974389AC1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14B966BB-CE23-4432-ADBB-89974389AC1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14B966BB-CE23-4432-ADBB-89974389AC1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80A4051B-4A36-4A8B-BA43-A5AB8AA959F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21AED160-72CD-4B0C-A6B6-EEB5DBAF4A53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EF5B962-4321-4D67-A560-E82B739AEAF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EF5B962-4321-4D67-A560-E82B739AEAF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EF5B962-4321-4D67-A560-E82B739AEAF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EF5B962-4321-4D67-A560-E82B739AEAF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC926427-E13D-4C13-9FE8-9F4C048623B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC926427-E13D-4C13-9FE8-9F4C048623B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC926427-E13D-4C13-9FE8-9F4C048623B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC926427-E13D-4C13-9FE8-9F4C048623B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{889F50AF-92F7-4076-9E76-0E3F1E7B7DFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{889F50AF-92F7-4076-9E76-0E3F1E7B7DFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{889F50AF-92F7-4076-9E76-0E3F1E7B7DFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{889F50AF-92F7-4076-9E76-0E3F1E7B7DFC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7C70BB15-870B-4946-8098-625DACD645A6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{E09DDC3B-0BBC-4275-A9DD-B366F4F02B81} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{8CC68C91-F169-4EAF-8DDA-963CD883B415} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D671433C-CCEA-4551-8F80-3FFB386BCF74}
+		SolutionGuid = {A4970D79-BF1C-4343-9070-B409DBB69F93}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Management/System.Management.sln b/src/libraries/System.Management/System.Management.sln
index 769ae068c5e0c0..1f3fc6a1025bb6 100644
--- a/src/libraries/System.Management/System.Management.sln
+++ b/src/libraries/System.Management/System.Management.sln
@@ -1,60 +1,170 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management.Tests", "tests\System.Management.Tests.csproj", "{5456707C-489E-4562-846E-B9598569F6BE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{950923D8-EC99-4F90-9BA6-8EB64582C555} = {950923D8-EC99-4F90-9BA6-8EB64582C555}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{45B6D324-6008-4A22-8AFD-1F96A2CF8CF3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management", "src\System.Management.csproj", "{950923D8-EC99-4F90-9BA6-8EB64582C555}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB} = {CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{EAF6A3C1-7B56-412F-90EA-C9B6212A71DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management", "ref\System.Management.csproj", "{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{C6A273C2-6898-413B-A2E7-72BCB8B978FB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\ref\System.CodeDom.csproj", "{EAEFAF2D-A83D-4813-BD23-56009A3691D9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\src\System.CodeDom.csproj", "{7B9EB977-908A-43CB-B2FB-E4E34373F3BF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{86F0F693-CDB8-411C-94C8-0CA8990ED56B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1A89E1EB-BD66-4F95-B4BA-A40927C738B3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{932532F7-2735-4196-9F0E-CE0794BF385A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{7D0A08FA-EF09-4C64-8676-A0CFD002A074}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management", "ref\System.Management.csproj", "{12233594-0AC7-45C7-B4E7-8DAF161A299E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management", "src\System.Management.csproj", "{D31C6457-B81D-4503-938B-93877DDDBDB5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Management.Tests", "tests\System.Management.Tests.csproj", "{7113AE59-F125-4378-B93A-9C5C1450B306}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{52002ED5-FD42-4D7D-9F05-DF35437D34B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{8725B39F-DB87-4980-95DD-3DD9C0C13F27}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{C76091F8-D9A4-4C43-8780-C41045F6FF2B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{B198BB3E-C6E8-4E78-A6ED-D518941CAB65}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{915A2A15-1DE3-42B1-A5CA-8FD0C453CA79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{5377455B-6988-4D08-8E05-275CCDB0BBD5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{C96C5661-9E1F-41DD-AD33-F393C4F9D79B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{216FDF3D-191F-4BF4-A44E-652D5BBB25B4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{45B6D324-6008-4A22-8AFD-1F96A2CF8CF3} = {216FDF3D-191F-4BF4-A44E-652D5BBB25B4}
+		{7113AE59-F125-4378-B93A-9C5C1450B306} = {216FDF3D-191F-4BF4-A44E-652D5BBB25B4}
+		{EAF6A3C1-7B56-412F-90EA-C9B6212A71DC} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{EAEFAF2D-A83D-4813-BD23-56009A3691D9} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{86F0F693-CDB8-411C-94C8-0CA8990ED56B} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{932532F7-2735-4196-9F0E-CE0794BF385A} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{12233594-0AC7-45C7-B4E7-8DAF161A299E} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{52002ED5-FD42-4D7D-9F05-DF35437D34B0} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{C76091F8-D9A4-4C43-8780-C41045F6FF2B} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{915A2A15-1DE3-42B1-A5CA-8FD0C453CA79} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C} = {CFFEB73A-7437-45BC-BA3D-82F5DD76D7DC}
+		{C6A273C2-6898-413B-A2E7-72BCB8B978FB} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{7B9EB977-908A-43CB-B2FB-E4E34373F3BF} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{7D0A08FA-EF09-4C64-8676-A0CFD002A074} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{D31C6457-B81D-4503-938B-93877DDDBDB5} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{8725B39F-DB87-4980-95DD-3DD9C0C13F27} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{B198BB3E-C6E8-4E78-A6ED-D518941CAB65} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{5377455B-6988-4D08-8E05-275CCDB0BBD5} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+		{C96C5661-9E1F-41DD-AD33-F393C4F9D79B} = {4AEF3B24-55C6-4A04-A31D-8A7EB1428EB7}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5456707C-489E-4562-846E-B9598569F6BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5456707C-489E-4562-846E-B9598569F6BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5456707C-489E-4562-846E-B9598569F6BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5456707C-489E-4562-846E-B9598569F6BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{950923D8-EC99-4F90-9BA6-8EB64582C555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{950923D8-EC99-4F90-9BA6-8EB64582C555}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{950923D8-EC99-4F90-9BA6-8EB64582C555}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{950923D8-EC99-4F90-9BA6-8EB64582C555}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1A89E1EB-BD66-4F95-B4BA-A40927C738B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1A89E1EB-BD66-4F95-B4BA-A40927C738B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1A89E1EB-BD66-4F95-B4BA-A40927C738B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1A89E1EB-BD66-4F95-B4BA-A40927C738B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45B6D324-6008-4A22-8AFD-1F96A2CF8CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45B6D324-6008-4A22-8AFD-1F96A2CF8CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45B6D324-6008-4A22-8AFD-1F96A2CF8CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45B6D324-6008-4A22-8AFD-1F96A2CF8CF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAF6A3C1-7B56-412F-90EA-C9B6212A71DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAF6A3C1-7B56-412F-90EA-C9B6212A71DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAF6A3C1-7B56-412F-90EA-C9B6212A71DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAF6A3C1-7B56-412F-90EA-C9B6212A71DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6A273C2-6898-413B-A2E7-72BCB8B978FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6A273C2-6898-413B-A2E7-72BCB8B978FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6A273C2-6898-413B-A2E7-72BCB8B978FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6A273C2-6898-413B-A2E7-72BCB8B978FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAEFAF2D-A83D-4813-BD23-56009A3691D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAEFAF2D-A83D-4813-BD23-56009A3691D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAEFAF2D-A83D-4813-BD23-56009A3691D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAEFAF2D-A83D-4813-BD23-56009A3691D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B9EB977-908A-43CB-B2FB-E4E34373F3BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B9EB977-908A-43CB-B2FB-E4E34373F3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B9EB977-908A-43CB-B2FB-E4E34373F3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B9EB977-908A-43CB-B2FB-E4E34373F3BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86F0F693-CDB8-411C-94C8-0CA8990ED56B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86F0F693-CDB8-411C-94C8-0CA8990ED56B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86F0F693-CDB8-411C-94C8-0CA8990ED56B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86F0F693-CDB8-411C-94C8-0CA8990ED56B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{932532F7-2735-4196-9F0E-CE0794BF385A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{932532F7-2735-4196-9F0E-CE0794BF385A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{932532F7-2735-4196-9F0E-CE0794BF385A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{932532F7-2735-4196-9F0E-CE0794BF385A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D0A08FA-EF09-4C64-8676-A0CFD002A074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D0A08FA-EF09-4C64-8676-A0CFD002A074}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D0A08FA-EF09-4C64-8676-A0CFD002A074}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D0A08FA-EF09-4C64-8676-A0CFD002A074}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12233594-0AC7-45C7-B4E7-8DAF161A299E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12233594-0AC7-45C7-B4E7-8DAF161A299E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12233594-0AC7-45C7-B4E7-8DAF161A299E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12233594-0AC7-45C7-B4E7-8DAF161A299E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D31C6457-B81D-4503-938B-93877DDDBDB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D31C6457-B81D-4503-938B-93877DDDBDB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D31C6457-B81D-4503-938B-93877DDDBDB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D31C6457-B81D-4503-938B-93877DDDBDB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7113AE59-F125-4378-B93A-9C5C1450B306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7113AE59-F125-4378-B93A-9C5C1450B306}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7113AE59-F125-4378-B93A-9C5C1450B306}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7113AE59-F125-4378-B93A-9C5C1450B306}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C1690B5-0B0F-4193-88AB-2E1CD77ACFDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52D7D724-C8EE-4D4B-A5D4-AFB4FECCCAD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52002ED5-FD42-4D7D-9F05-DF35437D34B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52002ED5-FD42-4D7D-9F05-DF35437D34B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52002ED5-FD42-4D7D-9F05-DF35437D34B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52002ED5-FD42-4D7D-9F05-DF35437D34B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8725B39F-DB87-4980-95DD-3DD9C0C13F27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8725B39F-DB87-4980-95DD-3DD9C0C13F27}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8725B39F-DB87-4980-95DD-3DD9C0C13F27}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8725B39F-DB87-4980-95DD-3DD9C0C13F27}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C76091F8-D9A4-4C43-8780-C41045F6FF2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B198BB3E-C6E8-4E78-A6ED-D518941CAB65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B198BB3E-C6E8-4E78-A6ED-D518941CAB65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B198BB3E-C6E8-4E78-A6ED-D518941CAB65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B198BB3E-C6E8-4E78-A6ED-D518941CAB65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{915A2A15-1DE3-42B1-A5CA-8FD0C453CA79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{915A2A15-1DE3-42B1-A5CA-8FD0C453CA79}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{915A2A15-1DE3-42B1-A5CA-8FD0C453CA79}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{915A2A15-1DE3-42B1-A5CA-8FD0C453CA79}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5377455B-6988-4D08-8E05-275CCDB0BBD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5377455B-6988-4D08-8E05-275CCDB0BBD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5377455B-6988-4D08-8E05-275CCDB0BBD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5377455B-6988-4D08-8E05-275CCDB0BBD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7C6E8BD-304B-499B-9A7E-E19CF4E3342C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C96C5661-9E1F-41DD-AD33-F393C4F9D79B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C96C5661-9E1F-41DD-AD33-F393C4F9D79B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C96C5661-9E1F-41DD-AD33-F393C4F9D79B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C96C5661-9E1F-41DD-AD33-F393C4F9D79B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5456707C-489E-4562-846E-B9598569F6BE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{950923D8-EC99-4F90-9BA6-8EB64582C555} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{CA17270B-079F-4D52-97E8-C0C2E8B9D7DB} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{1A89E1EB-BD66-4F95-B4BA-A40927C738B3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {37A7EF3B-1189-45B9-AA16-511BF8BFE57B}
+		SolutionGuid = {9D09EF76-3A6B-4481-95BC-9E56C3DCD30A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln
index 4325bf9b2822d3..6db556d3fb964f 100644
--- a/src/libraries/System.Memory/System.Memory.sln
+++ b/src/libraries/System.Memory/System.Memory.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Tests", "tests\System.Memory.Tests.csproj", "{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4BBC8F69-D03E-4432-AA8A-D458FA5B235A} = {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory", "src\System.Memory.csproj", "{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E883935B-D8FD-4FC9-A189-9D9E7F7EF550} = {E883935B-D8FD-4FC9-A189-9D9E7F7EF550}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A54FACA-933E-4C1D-92AB-1A5506CFC212}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory", "ref\System.Memory.csproj", "{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory", "ref\System.Memory.csproj", "{9112BAE3-344D-4DD0-ADC9-478D82B84584}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory", "src\System.Memory.csproj", "{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Tests", "tests\System.Memory.Tests.csproj", "{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{507DEA65-61AB-4F54-9770-CA8C9F9CA9CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{089B3C51-5542-4D01-A946-8DBD1E8EDE96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E140387C-8659-4B75-8987-53F169CFD5F9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED3785E9-1B65-4A38-9386-68FEBF93F4EE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{772FD84D-31F8-4D0F-B446-E36CD5EB0415}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F16E4E5E-F256-48DE-8BEE-826C415BBC8C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE}
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE}
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314} = {ED3785E9-1B65-4A38-9386-68FEBF93F4EE}
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415}
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297} = {772FD84D-31F8-4D0F-B446-E36CD5EB0415}
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C}
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C}
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C}
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C}
+		{E140387C-8659-4B75-8987-53F169CFD5F9} = {F16E4E5E-F256-48DE-8BEE-826C415BBC8C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E883935B-D8FD-4FC9-A189-9D9E7F7EF550}.Release|Any CPU.Build.0 = Release|Any CPU
-		{507DEA65-61AB-4F54-9770-CA8C9F9CA9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{507DEA65-61AB-4F54-9770-CA8C9F9CA9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{507DEA65-61AB-4F54-9770-CA8C9F9CA9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{507DEA65-61AB-4F54-9770-CA8C9F9CA9CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|Any CPU.Build.0 = Debug|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|x64.ActiveCfg = Debug|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|x64.Build.0 = Debug|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|x86.ActiveCfg = Debug|x86
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Debug|x86.Build.0 = Debug|x86
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|Any CPU.ActiveCfg = Release|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|Any CPU.Build.0 = Release|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x64.ActiveCfg = Release|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x64.Build.0 = Release|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x86.ActiveCfg = Release|x86
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Release|x86.Build.0 = Release|x86
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|Any CPU.Build.0 = Checked|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.ActiveCfg = Checked|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x64.Build.0 = Checked|x64
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.ActiveCfg = Checked|x86
+		{7746BFD6-E6D6-4703-AA2D-43380B5DEA22}.Checked|x86.Build.0 = Checked|x86
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x64.Build.0 = Release|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Release|x86.Build.0 = Release|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6A54FACA-933E-4C1D-92AB-1A5506CFC212}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|x64.Build.0 = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Debug|x86.Build.0 = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x64.ActiveCfg = Release|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x64.Build.0 = Release|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x86.ActiveCfg = Release|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Release|x86.Build.0 = Release|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FFBBF2A1-FBBD-442F-9EA1-8241B62A15A3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|x64.Build.0 = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Debug|x86.Build.0 = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x64.ActiveCfg = Release|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x64.Build.0 = Release|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x86.ActiveCfg = Release|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Release|x86.Build.0 = Release|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9112BAE3-344D-4DD0-ADC9-478D82B84584}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|x64.Build.0 = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Debug|x86.Build.0 = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x64.ActiveCfg = Release|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x64.Build.0 = Release|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x86.ActiveCfg = Release|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Release|x86.Build.0 = Release|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C9417154-D8DB-4FF9-9DD8-6B2ED351FC92}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|x64.Build.0 = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Debug|x86.Build.0 = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x64.ActiveCfg = Release|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x64.Build.0 = Release|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x86.ActiveCfg = Release|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Release|x86.Build.0 = Release|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C2BC6AE7-7E8B-4AA2-8E9F-5D4B9127B297}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x64.Build.0 = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Debug|x86.Build.0 = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x64.ActiveCfg = Release|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x64.Build.0 = Release|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.ActiveCfg = Release|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Release|x86.Build.0 = Release|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{94F64A00-DB8D-49F1-BB5E-25527DCE9F42}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Debug|x86.Build.0 = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x64.Build.0 = Release|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Release|x86.Build.0 = Release|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4E9C4BA9-5FE2-4774-AC6F-A42913D57314}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|x64.Build.0 = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Debug|x86.Build.0 = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x64.ActiveCfg = Release|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x64.Build.0 = Release|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x86.ActiveCfg = Release|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Release|x86.Build.0 = Release|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{089B3C51-5542-4D01-A946-8DBD1E8EDE96}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x64.Build.0 = Release|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Release|x86.Build.0 = Release|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E140387C-8659-4B75-8987-53F169CFD5F9}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4BBC8F69-D03E-4432-AA8A-D458FA5B235A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{E883935B-D8FD-4FC9-A189-9D9E7F7EF550} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{507DEA65-61AB-4F54-9770-CA8C9F9CA9CE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7196F6AB-8F22-4E4D-B6D1-3C2CFF86229C}
+		SolutionGuid = {65DB6A6B-0AAC-4BC2-A61A-641679771DC7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Connections/System.Net.Connections.sln b/src/libraries/System.Net.Connections/System.Net.Connections.sln
index a325eb24b97132..80a9d8b25d59f3 100644
--- a/src/libraries/System.Net.Connections/System.Net.Connections.sln
+++ b/src/libraries/System.Net.Connections/System.Net.Connections.sln
@@ -1,50 +1,100 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30310.162
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Connections", "src\System.Net.Connections.csproj", "{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {132BF813-FC40-4D39-8B6F-E55D7633F0ED}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6118B5D2-34F5-47F1-B26C-7678BB4F73D4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Connections", "ref\System.Net.Connections.csproj", "{132BF813-FC40-4D39-8B6F-E55D7633F0ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4204B8D5-DF51-4910-9A1B-12EC10A45E41}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\ref\System.IO.Pipelines.csproj", "{5885A39B-9961-4BB9-B691-908242D6D919}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\src\System.IO.Pipelines.csproj", "{6A9746CA-61E6-44FE-BBC2-1CF1F1BBCA57}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E0983BCC-F93B-4FFF-A4E4-EA874908783F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Connections", "ref\System.Net.Connections.csproj", "{4409894C-70E1-4383-8CCA-47D02096CACF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Connections.Tests", "tests\System.Net.Connections.Tests\System.Net.Connections.Tests.csproj", "{A4DB505A-FFD8-4A7B-B31A-12AD623E7AD9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Connections", "src\System.Net.Connections.csproj", "{5926F11C-5844-4A50-8BC7-ADE1E1568BEF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Connections.Tests", "tests\System.Net.Connections.Tests\System.Net.Connections.Tests.csproj", "{995314C3-6467-4DE6-900D-B8933311833E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A1589642-F094-433D-B00D-016A969CE0C3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{26AFA44E-9D50-4459-8F78-A6D2B73480F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B8135F9E-7769-4E8D-9D01-F1D1A15FF495}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{ACE2CB33-260D-4D21-9A53-24C57F719FB4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{032F99BE-697A-4918-92EF-D8AFB1679FEF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{465C9A06-BF87-47F4-85E8-6E7D806BF2E3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C0F7AF9C-AA70-44E3-B778-6F1F82ED74E2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{6118B5D2-34F5-47F1-B26C-7678BB4F73D4} = {032F99BE-697A-4918-92EF-D8AFB1679FEF}
+		{995314C3-6467-4DE6-900D-B8933311833E} = {032F99BE-697A-4918-92EF-D8AFB1679FEF}
+		{4204B8D5-DF51-4910-9A1B-12EC10A45E41} = {465C9A06-BF87-47F4-85E8-6E7D806BF2E3}
+		{5885A39B-9961-4BB9-B691-908242D6D919} = {465C9A06-BF87-47F4-85E8-6E7D806BF2E3}
+		{4409894C-70E1-4383-8CCA-47D02096CACF} = {465C9A06-BF87-47F4-85E8-6E7D806BF2E3}
+		{A1589642-F094-433D-B00D-016A969CE0C3} = {465C9A06-BF87-47F4-85E8-6E7D806BF2E3}
+		{B8135F9E-7769-4E8D-9D01-F1D1A15FF495} = {465C9A06-BF87-47F4-85E8-6E7D806BF2E3}
+		{ACE2CB33-260D-4D21-9A53-24C57F719FB4} = {465C9A06-BF87-47F4-85E8-6E7D806BF2E3}
+		{6A9746CA-61E6-44FE-BBC2-1CF1F1BBCA57} = {C0F7AF9C-AA70-44E3-B778-6F1F82ED74E2}
+		{5926F11C-5844-4A50-8BC7-ADE1E1568BEF} = {C0F7AF9C-AA70-44E3-B778-6F1F82ED74E2}
+		{26AFA44E-9D50-4459-8F78-A6D2B73480F0} = {C0F7AF9C-AA70-44E3-B778-6F1F82ED74E2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4DB505A-FFD8-4A7B-B31A-12AD623E7AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4DB505A-FFD8-4A7B-B31A-12AD623E7AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4DB505A-FFD8-4A7B-B31A-12AD623E7AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4DB505A-FFD8-4A7B-B31A-12AD623E7AD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6118B5D2-34F5-47F1-B26C-7678BB4F73D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6118B5D2-34F5-47F1-B26C-7678BB4F73D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6118B5D2-34F5-47F1-B26C-7678BB4F73D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6118B5D2-34F5-47F1-B26C-7678BB4F73D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4204B8D5-DF51-4910-9A1B-12EC10A45E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4204B8D5-DF51-4910-9A1B-12EC10A45E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4204B8D5-DF51-4910-9A1B-12EC10A45E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4204B8D5-DF51-4910-9A1B-12EC10A45E41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5885A39B-9961-4BB9-B691-908242D6D919}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5885A39B-9961-4BB9-B691-908242D6D919}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5885A39B-9961-4BB9-B691-908242D6D919}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5885A39B-9961-4BB9-B691-908242D6D919}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A9746CA-61E6-44FE-BBC2-1CF1F1BBCA57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A9746CA-61E6-44FE-BBC2-1CF1F1BBCA57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A9746CA-61E6-44FE-BBC2-1CF1F1BBCA57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A9746CA-61E6-44FE-BBC2-1CF1F1BBCA57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4409894C-70E1-4383-8CCA-47D02096CACF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4409894C-70E1-4383-8CCA-47D02096CACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4409894C-70E1-4383-8CCA-47D02096CACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4409894C-70E1-4383-8CCA-47D02096CACF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5926F11C-5844-4A50-8BC7-ADE1E1568BEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5926F11C-5844-4A50-8BC7-ADE1E1568BEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5926F11C-5844-4A50-8BC7-ADE1E1568BEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5926F11C-5844-4A50-8BC7-ADE1E1568BEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{995314C3-6467-4DE6-900D-B8933311833E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{995314C3-6467-4DE6-900D-B8933311833E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{995314C3-6467-4DE6-900D-B8933311833E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{995314C3-6467-4DE6-900D-B8933311833E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1589642-F094-433D-B00D-016A969CE0C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1589642-F094-433D-B00D-016A969CE0C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1589642-F094-433D-B00D-016A969CE0C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1589642-F094-433D-B00D-016A969CE0C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26AFA44E-9D50-4459-8F78-A6D2B73480F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26AFA44E-9D50-4459-8F78-A6D2B73480F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26AFA44E-9D50-4459-8F78-A6D2B73480F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26AFA44E-9D50-4459-8F78-A6D2B73480F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8135F9E-7769-4E8D-9D01-F1D1A15FF495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8135F9E-7769-4E8D-9D01-F1D1A15FF495}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8135F9E-7769-4E8D-9D01-F1D1A15FF495}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8135F9E-7769-4E8D-9D01-F1D1A15FF495}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ACE2CB33-260D-4D21-9A53-24C57F719FB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ACE2CB33-260D-4D21-9A53-24C57F719FB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ACE2CB33-260D-4D21-9A53-24C57F719FB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ACE2CB33-260D-4D21-9A53-24C57F719FB4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A4DB505A-FFD8-4A7B-B31A-12AD623E7AD9} = {E0983BCC-F93B-4FFF-A4E4-EA874908783F}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5100F629-0FAB-4C6F-9A54-95AE9565EE0D}
+		SolutionGuid = {11EE8A01-4C1F-40E0-84D0-6E1D8FD450D3}
 	EndGlobalSection
 EndGlobal
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 7e5da9f1a1c23e..d524cb56c046c6 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
@@ -1,67 +1,121 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29806.167
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "src\System.Net.Http.Json.csproj", "{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {132BF813-FC40-4D39-8B6F-E55D7633F0ED}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3AD3D600-C391-492D-B3D6-0F6C03DA5C27}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "ref\System.Net.Http.Json.csproj", "{132BF813-FC40-4D39-8B6F-E55D7633F0ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{6E75F701-4A14-4372-894E-F61B75026A96}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{97E2A49F-1C49-4E6B-B8E4-36DDDE746D61}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1B471D80-205C-4E9C-8D36-601275080642}"
+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.Functional.Tests", "tests\FunctionalTests\System.Net.Http.Json.Functional.Tests.csproj", "{DC607A29-7C8D-4933-9AEB-23CF696B2BC6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json", "src\System.Net.Http.Json.csproj", "{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json.Unit.Tests", "tests\UnitTests\System.Net.Http.Json.Unit.Tests.csproj", "{54A8AEE1-BEF2-454A-B1A1-548D73F25F0E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json.Functional.Tests", "tests\FunctionalTests\System.Net.Http.Json.Functional.Tests.csproj", "{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{136D3813-DD73-4C26-8741-E321A2356D13}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Json.Unit.Tests", "tests\UnitTests\System.Net.Http.Json.Unit.Tests.csproj", "{E5F445FD-335C-418D-A46F-D62AE59333FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{6D759C34-736F-44B2-9B7A-8D6CE1583B66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{9A6F9BDD-8A2C-4FC3-8661-2B97558F7401}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{BC7D3412-DBCB-4863-8BF8-41899E32608C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{486B6AB9-D72B-4ED7-BCC7-30B5C3939343}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F6810D33-6B66-466B-8EC4-E6E5A610C925}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0775A511-C87A-4B5D-BE5D-A01668F203FA}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{3AD3D600-C391-492D-B3D6-0F6C03DA5C27} = {486B6AB9-D72B-4ED7-BCC7-30B5C3939343}
+		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D} = {486B6AB9-D72B-4ED7-BCC7-30B5C3939343}
+		{E5F445FD-335C-418D-A46F-D62AE59333FC} = {486B6AB9-D72B-4ED7-BCC7-30B5C3939343}
+		{6E75F701-4A14-4372-894E-F61B75026A96} = {F6810D33-6B66-466B-8EC4-E6E5A610C925}
+		{97E2A49F-1C49-4E6B-B8E4-36DDDE746D61} = {F6810D33-6B66-466B-8EC4-E6E5A610C925}
+		{2F4E0ED7-19C4-4280-87EF-C32C155815F3} = {F6810D33-6B66-466B-8EC4-E6E5A610C925}
+		{3A94F7E1-CFEB-46B7-9F25-E92E6B6A8F22} = {F6810D33-6B66-466B-8EC4-E6E5A610C925}
+		{6D759C34-736F-44B2-9B7A-8D6CE1583B66} = {F6810D33-6B66-466B-8EC4-E6E5A610C925}
+		{9A6F9BDD-8A2C-4FC3-8661-2B97558F7401} = {F6810D33-6B66-466B-8EC4-E6E5A610C925}
+		{4FB629CD-5FFC-47AC-9670-A2A8AFEE8926} = {0775A511-C87A-4B5D-BE5D-A01668F203FA}
+		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E} = {0775A511-C87A-4B5D-BE5D-A01668F203FA}
+		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1} = {0775A511-C87A-4B5D-BE5D-A01668F203FA}
+		{FEBE9C47-A00B-40B2-A85B-74ECE2F8B80A} = {0775A511-C87A-4B5D-BE5D-A01668F203FA}
+		{BC7D3412-DBCB-4863-8BF8-41899E32608C} = {0775A511-C87A-4B5D-BE5D-A01668F203FA}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC607A29-7C8D-4933-9AEB-23CF696B2BC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC607A29-7C8D-4933-9AEB-23CF696B2BC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC607A29-7C8D-4933-9AEB-23CF696B2BC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC607A29-7C8D-4933-9AEB-23CF696B2BC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54A8AEE1-BEF2-454A-B1A1-548D73F25F0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54A8AEE1-BEF2-454A-B1A1-548D73F25F0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54A8AEE1-BEF2-454A-B1A1-548D73F25F0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54A8AEE1-BEF2-454A-B1A1-548D73F25F0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{136D3813-DD73-4C26-8741-E321A2356D13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{136D3813-DD73-4C26-8741-E321A2356D13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{136D3813-DD73-4C26-8741-E321A2356D13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{136D3813-DD73-4C26-8741-E321A2356D13}.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
+		{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
+		{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
+		{97E2A49F-1C49-4E6B-B8E4-36DDDE746D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97E2A49F-1C49-4E6B-B8E4-36DDDE746D61}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97E2A49F-1C49-4E6B-B8E4-36DDDE746D61}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97E2A49F-1C49-4E6B-B8E4-36DDDE746D61}.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
+		{7DC969DA-8BD3-4E64-88E8-26AFE65BFF7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D6F4698-E7FA-4AE3-A7A4-98939E40D08D}.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
+		{E5F445FD-335C-418D-A46F-D62AE59333FC}.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
+		{3EEB6FCC-2592-4879-ADDD-0FDC7AEB7BC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{6D759C34-736F-44B2-9B7A-8D6CE1583B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D759C34-736F-44B2-9B7A-8D6CE1583B66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D759C34-736F-44B2-9B7A-8D6CE1583B66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D759C34-736F-44B2-9B7A-8D6CE1583B66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A6F9BDD-8A2C-4FC3-8661-2B97558F7401}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A6F9BDD-8A2C-4FC3-8661-2B97558F7401}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A6F9BDD-8A2C-4FC3-8661-2B97558F7401}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A6F9BDD-8A2C-4FC3-8661-2B97558F7401}.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
+		{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
+		{BC7D3412-DBCB-4863-8BF8-41899E32608C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{DC607A29-7C8D-4933-9AEB-23CF696B2BC6} = {1B471D80-205C-4E9C-8D36-601275080642}
-		{54A8AEE1-BEF2-454A-B1A1-548D73F25F0E} = {1B471D80-205C-4E9C-8D36-601275080642}
-		{136D3813-DD73-4C26-8741-E321A2356D13} = {1B471D80-205C-4E9C-8D36-601275080642}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5100F629-0FAB-4C6F-9A54-95AE9565EE0D}
+		SolutionGuid = {A121E5BA-D935-4572-8D67-2F15DF29922B}
 	EndGlobalSection
 EndGlobal
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 317ffc6850b4cc..f9b2b579d78fd2 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
@@ -1,70 +1,149 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F75E3008-0562-42DF-BE72-C1384F12157E} = {F75E3008-0562-42DF-BE72-C1384F12157E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{49FC63FA-3E81-4335-91CF-B5056E007343}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests\UnitTests\System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{A2ECDEDB-12B7-402C-9230-152B7601179F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F75E3008-0562-42DF-BE72-C1384F12157E} = {F75E3008-0562-42DF-BE72-C1384F12157E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{D18082CB-C337-473B-8AC3-5FCC312F90C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler", "src\System.Net.Http.WinHttpHandler.csproj", "{F75E3008-0562-42DF-BE72-C1384F12157E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483} = {8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}
-	EndProjectSection
+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.Net.Http.WinHttpHandler", "ref\System.Net.Http.WinHttpHandler.csproj", "{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{845F6CBC-8663-446C-B874-9BE54D2EF6EC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\ref\System.DirectoryServices.Protocols.csproj", "{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{7EF13CC5-C714-4C0F-990F-C0884B92A9A1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{EC757BFE-12A2-48D4-8C2D-B9F273CACB8D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler", "ref\System.Net.Http.WinHttpHandler.csproj", "{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler", "src\System.Net.Http.WinHttpHandler.csproj", "{DE2A69CC-4962-4BF6-A714-41A87A6C045B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler.Functional.Tests", "tests\FunctionalTests\System.Net.Http.WinHttpHandler.Functional.Tests.csproj", "{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.WinHttpHandler.Unit.Tests", "tests\UnitTests\System.Net.Http.WinHttpHandler.Unit.Tests.csproj", "{090BA6CA-F661-4BDE-9663-65F8231DDB1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E2311DD8-2E5E-4DD7-840F-237A8F77A311}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B294FD03-AC49-4235-863F-5966BAB0C84D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{6408B084-5213-4955-8262-6740B96045B2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{488643D8-1F81-4998-8A6C-E00978977AD2}"
+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", "..\System.Text.Json\src\System.Text.Json.csproj", "{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D26A4951-218E-4AC9-BDA0-AB7E654E1472}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E71EAE8-4677-4E28-A2A3-09AD42E702EC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{49FC63FA-3E81-4335-91CF-B5056E007343} = {D26A4951-218E-4AC9-BDA0-AB7E654E1472}
+		{E9D5AB56-2597-42E0-BE81-C00CC63D1FB3} = {D26A4951-218E-4AC9-BDA0-AB7E654E1472}
+		{090BA6CA-F661-4BDE-9663-65F8231DDB1D} = {D26A4951-218E-4AC9-BDA0-AB7E654E1472}
+		{D18082CB-C337-473B-8AC3-5FCC312F90C6} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{845F6CBC-8663-446C-B874-9BE54D2EF6EC} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{E2311DD8-2E5E-4DD7-840F-237A8F77A311} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{B294FD03-AC49-4235-863F-5966BAB0C84D} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{6408B084-5213-4955-8262-6740B96045B2} = {80770A49-D1DC-4FB3-9C3E-3DE94ED72B62}
+		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{E6A8B90B-69CD-4B0D-8A33-F208A3169674} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{DE2A69CC-4962-4BF6-A714-41A87A6C045B} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{28C24BF8-8E08-485F-8EEE-817EB847774C} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{488643D8-1F81-4998-8A6C-E00978977AD2} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{BACC5257-6CA8-45C7-970F-C8D501DA59AB} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A} = {2E71EAE8-4677-4E28-A2A3-09AD42E702EC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2ECDEDB-12B7-402C-9230-152B7601179F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2ECDEDB-12B7-402C-9230-152B7601179F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F75E3008-0562-42DF-BE72-C1384F12157E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F75E3008-0562-42DF-BE72-C1384F12157E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F75E3008-0562-42DF-BE72-C1384F12157E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC757BFE-12A2-48D4-8C2D-B9F273CACB8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC757BFE-12A2-48D4-8C2D-B9F273CACB8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC757BFE-12A2-48D4-8C2D-B9F273CACB8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC757BFE-12A2-48D4-8C2D-B9F273CACB8D}.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
+		{49FC63FA-3E81-4335-91CF-B5056E007343}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D18082CB-C337-473B-8AC3-5FCC312F90C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{4BA25EC1-B76B-4410-AF2D-A54B90FAB404}.Release|Any CPU.Build.0 = Release|Any CPU
+		{845F6CBC-8663-446C-B874-9BE54D2EF6EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{845F6CBC-8663-446C-B874-9BE54D2EF6EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{845F6CBC-8663-446C-B874-9BE54D2EF6EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{845F6CBC-8663-446C-B874-9BE54D2EF6EC}.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
+		{6FD15E9F-9E3B-494C-8F7F-67C9641A3FDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EF13CC5-C714-4C0F-990F-C0884B92A9A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{B3C3E9D6-EEB3-4DE1-9B35-C0984474E522}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE2A69CC-4962-4BF6-A714-41A87A6C045B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{B294FD03-AC49-4235-863F-5966BAB0C84D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B294FD03-AC49-4235-863F-5966BAB0C84D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B294FD03-AC49-4235-863F-5966BAB0C84D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B294FD03-AC49-4235-863F-5966BAB0C84D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6408B084-5213-4955-8262-6740B96045B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6408B084-5213-4955-8262-6740B96045B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6408B084-5213-4955-8262-6740B96045B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6408B084-5213-4955-8262-6740B96045B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{488643D8-1F81-4998-8A6C-E00978977AD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{488643D8-1F81-4998-8A6C-E00978977AD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{488643D8-1F81-4998-8A6C-E00978977AD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{488643D8-1F81-4998-8A6C-E00978977AD2}.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
+		{E470810A-BAF2-4B3C-92CB-72007B7F1B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{17D5CC82-F72C-4DD2-B6DB-DE7FB2F19C34} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A2ECDEDB-12B7-402C-9230-152B7601179F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F75E3008-0562-42DF-BE72-C1384F12157E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{8C9AABA7-A8F0-4A5A-8A5F-65A0EFC03483} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{EC757BFE-12A2-48D4-8C2D-B9F273CACB8D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5537B438-75BD-458F-A470-C34DA2A3720F}
+		SolutionGuid = {F5BAF3DD-D05C-4DCC-BB36-16645CA1F151}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln
index 502e141c7feff0..cb0bda179d0a40 100644
--- a/src/libraries/System.Net.Http/System.Net.Http.sln
+++ b/src/libraries/System.Net.Http/System.Net.Http.sln
@@ -1,70 +1,149 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Functional.Tests", "tests\FunctionalTests\System.Net.Http.Functional.Tests.csproj", "{C85CF035-7804-41FF-9557-48B7C948B58D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}
-	EndProjectSection
+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.Net.Http.Unit.Tests", "tests\UnitTests\System.Net.Http.Unit.Tests.csproj", "{5F9C3C9F-652E-461E-B2D6-85D264F5A733}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7876B6E8-4D40-4C11-AFB0-EBAE25B85E06}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http", "src\System.Net.Http.csproj", "{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {132BF813-FC40-4D39-8B6F-E55D7633F0ED}
-	EndProjectSection
+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.Net.Http", "ref\System.Net.Http.csproj", "{132BF813-FC40-4D39-8B6F-E55D7633F0ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{8D82C57C-D809-4E65-BDFF-E73C13DA37BC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http", "ref\System.Net.Http.csproj", "{CB685EA0-3A2C-4966-82EF-F04D0C02A419}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http", "src\System.Net.Http.csproj", "{11F31E64-4000-47F3-AE19-C83EB4EC0ED8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9448438C-CF47-4242-9D82-77FCCFCCA1AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Enterprise.Tests", "tests\EnterpriseTests\System.Net.Http.Enterprise.Tests.csproj", "{51412712-224A-4F69-9964-3EFBEB2AA3E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Functional.Tests", "tests\FunctionalTests\System.Net.Http.Functional.Tests.csproj", "{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Unit.Tests", "tests\UnitTests\System.Net.Http.Unit.Tests.csproj", "{FC7EE3FF-B352-442D-AB17-E0055121B918}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "..\System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{819DB839-291D-4128-A2D8-719340A7DEBF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6573D8B3-6B20-43CE-ABE7-42D8659CBB35}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{ACDD8D8E-6945-41BC-87BD-1BD225653521}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{DF76DF11-B1DA-44EB-A194-A1869DF4C072}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\ref\System.Security.Cryptography.OpenSsl.csproj", "{9F5F7592-23B4-482B-899F-FCD8F719A1B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F7E6A456-EEBC-4D69-BBBE-8B87FDA6BE80}"
+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}") = "tests", "tests", "{2CA725D2-C887-42E1-B3EC-BA8DD3EC22C0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{922FECE2-1A06-4275-84A6-B1C4AD97C969}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85} = {2CA725D2-C887-42E1-B3EC-BA8DD3EC22C0}
+		{51412712-224A-4F69-9964-3EFBEB2AA3E0} = {2CA725D2-C887-42E1-B3EC-BA8DD3EC22C0}
+		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2} = {2CA725D2-C887-42E1-B3EC-BA8DD3EC22C0}
+		{FC7EE3FF-B352-442D-AB17-E0055121B918} = {2CA725D2-C887-42E1-B3EC-BA8DD3EC22C0}
+		{7876B6E8-4D40-4C11-AFB0-EBAE25B85E06} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{69B3AD9D-E5B7-4512-8097-5D14DC5C18F1} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{CB685EA0-3A2C-4966-82EF-F04D0C02A419} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{DF76DF11-B1DA-44EB-A194-A1869DF4C072} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{9F5F7592-23B4-482B-899F-FCD8F719A1B3} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{F7E6A456-EEBC-4D69-BBBE-8B87FDA6BE80} = {922FECE2-1A06-4275-84A6-B1C4AD97C969}
+		{8D82C57C-D809-4E65-BDFF-E73C13DA37BC} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+		{0DB06F2E-2C33-4DBF-A572-76753EEA6B2C} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+		{11F31E64-4000-47F3-AE19-C83EB4EC0ED8} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+		{819DB839-291D-4128-A2D8-719340A7DEBF} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+		{ACDD8D8E-6945-41BC-87BD-1BD225653521} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+		{A33FBFF8-9EF6-4FF9-BD24-B73827DBA9E5} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+		{32FE3BA2-6FC8-4537-BD04-47236BAFE9F0} = {3F77AB0A-AC79-4E14-92DD-C42971DA3C2A}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F9C3C9F-652E-461E-B2D6-85D264F5A733}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9448438C-CF47-4242-9D82-77FCCFCCA1AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9448438C-CF47-4242-9D82-77FCCFCCA1AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9448438C-CF47-4242-9D82-77FCCFCCA1AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9448438C-CF47-4242-9D82-77FCCFCCA1AB}.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
+		{2A0CAB20-38D5-43D4-86E4-B4BB749CFC85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7876B6E8-4D40-4C11-AFB0-EBAE25B85E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7876B6E8-4D40-4C11-AFB0-EBAE25B85E06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7876B6E8-4D40-4C11-AFB0-EBAE25B85E06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7876B6E8-4D40-4C11-AFB0-EBAE25B85E06}.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
+		{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
+		{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
+		{CB685EA0-3A2C-4966-82EF-F04D0C02A419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB685EA0-3A2C-4966-82EF-F04D0C02A419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB685EA0-3A2C-4966-82EF-F04D0C02A419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB685EA0-3A2C-4966-82EF-F04D0C02A419}.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
+		{51412712-224A-4F69-9964-3EFBEB2AA3E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{AE3FAA66-DF03-4EE1-91BA-B65C3DE94DF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{FC7EE3FF-B352-442D-AB17-E0055121B918}.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
+		{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
+		{6573D8B3-6B20-43CE-ABE7-42D8659CBB35}.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
+		{DF76DF11-B1DA-44EB-A194-A1869DF4C072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF76DF11-B1DA-44EB-A194-A1869DF4C072}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF76DF11-B1DA-44EB-A194-A1869DF4C072}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF76DF11-B1DA-44EB-A194-A1869DF4C072}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F5F7592-23B4-482B-899F-FCD8F719A1B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F5F7592-23B4-482B-899F-FCD8F719A1B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F5F7592-23B4-482B-899F-FCD8F719A1B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F5F7592-23B4-482B-899F-FCD8F719A1B3}.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
+		{F7E6A456-EEBC-4D69-BBBE-8B87FDA6BE80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7E6A456-EEBC-4D69-BBBE-8B87FDA6BE80}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7E6A456-EEBC-4D69-BBBE-8B87FDA6BE80}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7E6A456-EEBC-4D69-BBBE-8B87FDA6BE80}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C85CF035-7804-41FF-9557-48B7C948B58D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5F9C3C9F-652E-461E-B2D6-85D264F5A733} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9448438C-CF47-4242-9D82-77FCCFCCA1AB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5100F629-0FAB-4C6F-9A54-95AE9565EE0D}
+		SolutionGuid = {F1EF65A2-61B3-45A3-9CDE-BD62218BE447}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
index e1e5729a5e27f3..93d7d9f8446d0b 100644
--- a/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
+++ b/src/libraries/System.Net.HttpListener/System.Net.HttpListener.sln
@@ -1,60 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener.Tests", "tests\System.Net.HttpListener.Tests.csproj", "{851A40FE-7F07-415D-8592-5FE2096E84D3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB} = {31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0CCA61A1-58CA-4D94-90FC-9D660B99E9F0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener", "src\System.Net.HttpListener.csproj", "{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{41899248-F846-4F88-91A1-01B037F93BF3} = {41899248-F846-4F88-91A1-01B037F93BF3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{F1AB00B7-6EB6-4A0B-BE86-402EA6644C89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener", "ref\System.Net.HttpListener.csproj", "{41899248-F846-4F88-91A1-01B037F93BF3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener", "ref\System.Net.HttpListener.csproj", "{24DD2F6E-B010-4654-B0ED-91279034846E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener", "src\System.Net.HttpListener.csproj", "{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.HttpListener.Tests", "tests\System.Net.HttpListener.Tests.csproj", "{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D7F69F8E-309B-4D9A-97B2-0CEE25492B2A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D878C9A2-651A-4D46-BF8A-E4394F3F3967}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F80816C5-70B4-4385-9E2F-3389D8A86196}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{94DAA59D-EF98-4FBC-A1F7-F4C3A4120983}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{75DAAF3A-23E3-4C9C-A701-BA5494346925}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B8DC1B67-53F8-4D68-9532-34E8CEFBB93F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE97B6EA-30B8-4AD6-A035-8A4B9138A3F9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9175409A-2482-494B-BDFC-9104088C9A9B}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0CCA61A1-58CA-4D94-90FC-9D660B99E9F0} = {B8DC1B67-53F8-4D68-9532-34E8CEFBB93F}
+		{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB} = {B8DC1B67-53F8-4D68-9532-34E8CEFBB93F}
+		{F1AB00B7-6EB6-4A0B-BE86-402EA6644C89} = {DE97B6EA-30B8-4AD6-A035-8A4B9138A3F9}
+		{24DD2F6E-B010-4654-B0ED-91279034846E} = {DE97B6EA-30B8-4AD6-A035-8A4B9138A3F9}
+		{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B} = {DE97B6EA-30B8-4AD6-A035-8A4B9138A3F9}
+		{F80816C5-70B4-4385-9E2F-3389D8A86196} = {DE97B6EA-30B8-4AD6-A035-8A4B9138A3F9}
+		{94DAA59D-EF98-4FBC-A1F7-F4C3A4120983} = {DE97B6EA-30B8-4AD6-A035-8A4B9138A3F9}
+		{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2} = {9175409A-2482-494B-BDFC-9104088C9A9B}
+		{D878C9A2-651A-4D46-BF8A-E4394F3F3967} = {9175409A-2482-494B-BDFC-9104088C9A9B}
+		{75DAAF3A-23E3-4C9C-A701-BA5494346925} = {9175409A-2482-494B-BDFC-9104088C9A9B}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{851A40FE-7F07-415D-8592-5FE2096E84D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{851A40FE-7F07-415D-8592-5FE2096E84D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{851A40FE-7F07-415D-8592-5FE2096E84D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{851A40FE-7F07-415D-8592-5FE2096E84D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41899248-F846-4F88-91A1-01B037F93BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41899248-F846-4F88-91A1-01B037F93BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41899248-F846-4F88-91A1-01B037F93BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41899248-F846-4F88-91A1-01B037F93BF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7F69F8E-309B-4D9A-97B2-0CEE25492B2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7F69F8E-309B-4D9A-97B2-0CEE25492B2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7F69F8E-309B-4D9A-97B2-0CEE25492B2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7F69F8E-309B-4D9A-97B2-0CEE25492B2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CCA61A1-58CA-4D94-90FC-9D660B99E9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CCA61A1-58CA-4D94-90FC-9D660B99E9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CCA61A1-58CA-4D94-90FC-9D660B99E9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CCA61A1-58CA-4D94-90FC-9D660B99E9F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1AB00B7-6EB6-4A0B-BE86-402EA6644C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1AB00B7-6EB6-4A0B-BE86-402EA6644C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1AB00B7-6EB6-4A0B-BE86-402EA6644C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1AB00B7-6EB6-4A0B-BE86-402EA6644C89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{24DD2F6E-B010-4654-B0ED-91279034846E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{24DD2F6E-B010-4654-B0ED-91279034846E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{24DD2F6E-B010-4654-B0ED-91279034846E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{24DD2F6E-B010-4654-B0ED-91279034846E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{706D27A6-E66A-4FF5-9E6A-EA1B8BC52FB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D6743F7-7918-4B74-A2C2-ECC6CE2AC0BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D48FCA59-B78B-4E81-8DB5-1B0B6596F71B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D878C9A2-651A-4D46-BF8A-E4394F3F3967}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F80816C5-70B4-4385-9E2F-3389D8A86196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F80816C5-70B4-4385-9E2F-3389D8A86196}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F80816C5-70B4-4385-9E2F-3389D8A86196}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F80816C5-70B4-4385-9E2F-3389D8A86196}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94DAA59D-EF98-4FBC-A1F7-F4C3A4120983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94DAA59D-EF98-4FBC-A1F7-F4C3A4120983}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94DAA59D-EF98-4FBC-A1F7-F4C3A4120983}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94DAA59D-EF98-4FBC-A1F7-F4C3A4120983}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75DAAF3A-23E3-4C9C-A701-BA5494346925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75DAAF3A-23E3-4C9C-A701-BA5494346925}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75DAAF3A-23E3-4C9C-A701-BA5494346925}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75DAAF3A-23E3-4C9C-A701-BA5494346925}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{851A40FE-7F07-415D-8592-5FE2096E84D3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{31E8D18B-9E7D-4924-AFD8-5BD8D75C31FB} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{41899248-F846-4F88-91A1-01B037F93BF3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{D7F69F8E-309B-4D9A-97B2-0CEE25492B2A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1E616CB8-18E3-46C0-B26F-25D094E2E5E0}
+		SolutionGuid = {19365E8B-E996-4E55-B468-A126849865D8}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Mail/System.Net.Mail.sln b/src/libraries/System.Net.Mail/System.Net.Mail.sln
index d939b7ae476ae7..b11342f0416ed8 100644
--- a/src/libraries/System.Net.Mail/System.Net.Mail.sln
+++ b/src/libraries/System.Net.Mail/System.Net.Mail.sln
@@ -1,70 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail.Functional.Tests", "tests\Functional\System.Net.Mail.Functional.Tests.csproj", "{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89} = {2BA70C31-18B0-461B-B6C9-14B11B65BE89}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{806B71BB-1D75-4E47-9FF2-C3BB627C71D9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail.Unit.Tests", "tests\Unit\System.Net.Mail.Unit.Tests.csproj", "{2525E37E-0EC1-4374-92FD-D2752BEED978}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89} = {2BA70C31-18B0-461B-B6C9-14B11B65BE89}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{AE73C91C-0341-494A-8BF1-8682F8707316}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail", "src\System.Net.Mail.csproj", "{2BA70C31-18B0-461B-B6C9-14B11B65BE89}"
-	ProjectSection(ProjectDependencies) = postProject
-		{301ABDC3-6604-477F-B7CB-1AAD6A8408CF} = {301ABDC3-6604-477F-B7CB-1AAD6A8408CF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail", "ref\System.Net.Mail.csproj", "{A743A5C2-5DE7-433B-A623-893B0BAE83D8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail", "ref\System.Net.Mail.csproj", "{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail", "src\System.Net.Mail.csproj", "{AF805BBD-C4A4-4D69-A911-D651E008C655}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail.Functional.Tests", "tests\Functional\System.Net.Mail.Functional.Tests.csproj", "{7AB412AE-E817-42C8-83A7-8FCE4F7C19D5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Mail.Unit.Tests", "tests\Unit\System.Net.Mail.Unit.Tests.csproj", "{78D06A89-4961-4441-8898-17FDB8BC99CE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1BB79710-16BD-4ED4-8BF4-13D25CBF4208}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{76A1DAB5-9795-4277-A070-C2B9329CBA69}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{45E09572-B102-4F3C-A7D4-95AAB7160E0B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{21FDEEBB-62E0-4F2C-A579-9BC2FB251BDC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DA60226B-0DF3-4224-BF29-709AA2394180}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{C1A89ACE-4A15-4C86-8E02-C3627748DD9A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0A685A9-BCA5-4A3E-9D1C-506721BB1866}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{806B71BB-1D75-4E47-9FF2-C3BB627C71D9} = {DA60226B-0DF3-4224-BF29-709AA2394180}
+		{7AB412AE-E817-42C8-83A7-8FCE4F7C19D5} = {DA60226B-0DF3-4224-BF29-709AA2394180}
+		{78D06A89-4961-4441-8898-17FDB8BC99CE} = {DA60226B-0DF3-4224-BF29-709AA2394180}
+		{AE73C91C-0341-494A-8BF1-8682F8707316} = {C1A89ACE-4A15-4C86-8E02-C3627748DD9A}
+		{A743A5C2-5DE7-433B-A623-893B0BAE83D8} = {C1A89ACE-4A15-4C86-8E02-C3627748DD9A}
+		{1BB79710-16BD-4ED4-8BF4-13D25CBF4208} = {C1A89ACE-4A15-4C86-8E02-C3627748DD9A}
+		{45E09572-B102-4F3C-A7D4-95AAB7160E0B} = {C1A89ACE-4A15-4C86-8E02-C3627748DD9A}
+		{21FDEEBB-62E0-4F2C-A579-9BC2FB251BDC} = {C1A89ACE-4A15-4C86-8E02-C3627748DD9A}
+		{AF805BBD-C4A4-4D69-A911-D651E008C655} = {A0A685A9-BCA5-4A3E-9D1C-506721BB1866}
+		{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892} = {A0A685A9-BCA5-4A3E-9D1C-506721BB1866}
+		{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8} = {A0A685A9-BCA5-4A3E-9D1C-506721BB1866}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A26D88B7-6EF6-4C8C-828B-7B57732CCE38}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2525E37E-0EC1-4374-92FD-D2752BEED978}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2525E37E-0EC1-4374-92FD-D2752BEED978}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{301ABDC3-6604-477F-B7CB-1AAD6A8408CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76A1DAB5-9795-4277-A070-C2B9329CBA69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76A1DAB5-9795-4277-A070-C2B9329CBA69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76A1DAB5-9795-4277-A070-C2B9329CBA69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76A1DAB5-9795-4277-A070-C2B9329CBA69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{806B71BB-1D75-4E47-9FF2-C3BB627C71D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{806B71BB-1D75-4E47-9FF2-C3BB627C71D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{806B71BB-1D75-4E47-9FF2-C3BB627C71D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{806B71BB-1D75-4E47-9FF2-C3BB627C71D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE73C91C-0341-494A-8BF1-8682F8707316}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE73C91C-0341-494A-8BF1-8682F8707316}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE73C91C-0341-494A-8BF1-8682F8707316}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE73C91C-0341-494A-8BF1-8682F8707316}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A743A5C2-5DE7-433B-A623-893B0BAE83D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A743A5C2-5DE7-433B-A623-893B0BAE83D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A743A5C2-5DE7-433B-A623-893B0BAE83D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A743A5C2-5DE7-433B-A623-893B0BAE83D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF805BBD-C4A4-4D69-A911-D651E008C655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF805BBD-C4A4-4D69-A911-D651E008C655}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF805BBD-C4A4-4D69-A911-D651E008C655}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF805BBD-C4A4-4D69-A911-D651E008C655}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7AB412AE-E817-42C8-83A7-8FCE4F7C19D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7AB412AE-E817-42C8-83A7-8FCE4F7C19D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7AB412AE-E817-42C8-83A7-8FCE4F7C19D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7AB412AE-E817-42C8-83A7-8FCE4F7C19D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78D06A89-4961-4441-8898-17FDB8BC99CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78D06A89-4961-4441-8898-17FDB8BC99CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78D06A89-4961-4441-8898-17FDB8BC99CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78D06A89-4961-4441-8898-17FDB8BC99CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BB79710-16BD-4ED4-8BF4-13D25CBF4208}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0E01BDD-5CF1-482F-B0BC-BA6EE8E6D892}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45E09572-B102-4F3C-A7D4-95AAB7160E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45E09572-B102-4F3C-A7D4-95AAB7160E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45E09572-B102-4F3C-A7D4-95AAB7160E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45E09572-B102-4F3C-A7D4-95AAB7160E0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21FDEEBB-62E0-4F2C-A579-9BC2FB251BDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21FDEEBB-62E0-4F2C-A579-9BC2FB251BDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21FDEEBB-62E0-4F2C-A579-9BC2FB251BDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21FDEEBB-62E0-4F2C-A579-9BC2FB251BDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8AE1AF68-EBDC-497B-A189-5B4C66FA57D8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A26D88B7-6EF6-4C8C-828B-7B57732CCE38} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2525E37E-0EC1-4374-92FD-D2752BEED978} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2BA70C31-18B0-461B-B6C9-14B11B65BE89} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{301ABDC3-6604-477F-B7CB-1AAD6A8408CF} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{76A1DAB5-9795-4277-A070-C2B9329CBA69} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D19970E0-A764-433B-99CD-DD20D9FBBD8D}
+		SolutionGuid = {5A7D0500-9878-41E4-B10B-94A5E2CCE8B8}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
index f1f276d2d5c551..83e8aa0d133cec 100644
--- a/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
+++ b/src/libraries/System.Net.NameResolution/System.Net.NameResolution.sln
@@ -1,80 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Functional.Tests", "tests\FunctionalTests\System.Net.NameResolution.Functional.Tests.csproj", "{4FE5ECEE-ACC5-4558-A946-573426599B73}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1714448C-211E-48C1-8B7E-4EE667D336A1} = {1714448C-211E-48C1-8B7E-4EE667D336A1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{00BF602B-F709-4108-9A39-C57A493D3EF8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Pal.Tests.csproj", "{F6D1C093-081D-46DE-B5A8-516533375FDD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1714448C-211E-48C1-8B7E-4EE667D336A1} = {1714448C-211E-48C1-8B7E-4EE667D336A1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{77720BB9-1319-4BF7-A2DB-B1FC3F20FD1F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Unit.Tests", "tests\UnitTests\System.Net.NameResolution.Unit.Tests.csproj", "{239347DB-D566-48C9-9551-28AB3AD12EC3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1714448C-211E-48C1-8B7E-4EE667D336A1} = {1714448C-211E-48C1-8B7E-4EE667D336A1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution", "ref\System.Net.NameResolution.csproj", "{15B66DCE-70BF-43D6-854D-42A6C840B22C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution", "src\System.Net.NameResolution.csproj", "{1714448C-211E-48C1-8B7E-4EE667D336A1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{324DF6B2-4234-47FF-A2C7-A739F19E8F17} = {324DF6B2-4234-47FF-A2C7-A739F19E8F17}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution", "src\System.Net.NameResolution.csproj", "{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution", "ref\System.Net.NameResolution.csproj", "{324DF6B2-4234-47FF-A2C7-A739F19E8F17}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Functional.Tests", "tests\FunctionalTests\System.Net.NameResolution.Functional.Tests.csproj", "{BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Pal.Tests", "tests\PalTests\System.Net.NameResolution.Pal.Tests.csproj", "{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NameResolution.Unit.Tests", "tests\UnitTests\System.Net.NameResolution.Unit.Tests.csproj", "{82007016-ED8D-408E-BA83-DFB3F74B104F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A3FC70CE-3746-4E03-A92F-0102716FA97E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FFC47713-B417-43AD-B7D7-2D5DA1C00F0D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D62E59F2-BDF3-4060-85E0-20D1BB41B95E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{39B50FAE-211A-4C44-8FD0-2731C82580E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{06B581E4-A15B-4B5B-93D1-3B0463D1A338}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{FB254BF6-9C7C-4A35-A8B1-FB8832382442}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{41E915D1-3857-4F01-8576-B24104359E0B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B9D5A47D-9CA5-4FE1-AFE2-5E85A940B43D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{70406CAA-4033-4E31-A2B0-4D8AD8B7F608}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{00BF602B-F709-4108-9A39-C57A493D3EF8} = {41E915D1-3857-4F01-8576-B24104359E0B}
+		{BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379} = {41E915D1-3857-4F01-8576-B24104359E0B}
+		{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043} = {41E915D1-3857-4F01-8576-B24104359E0B}
+		{82007016-ED8D-408E-BA83-DFB3F74B104F} = {41E915D1-3857-4F01-8576-B24104359E0B}
+		{77720BB9-1319-4BF7-A2DB-B1FC3F20FD1F} = {B9D5A47D-9CA5-4FE1-AFE2-5E85A940B43D}
+		{15B66DCE-70BF-43D6-854D-42A6C840B22C} = {B9D5A47D-9CA5-4FE1-AFE2-5E85A940B43D}
+		{A3FC70CE-3746-4E03-A92F-0102716FA97E} = {B9D5A47D-9CA5-4FE1-AFE2-5E85A940B43D}
+		{39B50FAE-211A-4C44-8FD0-2731C82580E2} = {B9D5A47D-9CA5-4FE1-AFE2-5E85A940B43D}
+		{06B581E4-A15B-4B5B-93D1-3B0463D1A338} = {B9D5A47D-9CA5-4FE1-AFE2-5E85A940B43D}
+		{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175} = {70406CAA-4033-4E31-A2B0-4D8AD8B7F608}
+		{D62E59F2-BDF3-4060-85E0-20D1BB41B95E} = {70406CAA-4033-4E31-A2B0-4D8AD8B7F608}
+		{FB254BF6-9C7C-4A35-A8B1-FB8832382442} = {70406CAA-4033-4E31-A2B0-4D8AD8B7F608}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FE5ECEE-ACC5-4558-A946-573426599B73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FE5ECEE-ACC5-4558-A946-573426599B73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6D1C093-081D-46DE-B5A8-516533375FDD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{239347DB-D566-48C9-9551-28AB3AD12EC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{239347DB-D566-48C9-9551-28AB3AD12EC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1714448C-211E-48C1-8B7E-4EE667D336A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1714448C-211E-48C1-8B7E-4EE667D336A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{324DF6B2-4234-47FF-A2C7-A739F19E8F17}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FFC47713-B417-43AD-B7D7-2D5DA1C00F0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FFC47713-B417-43AD-B7D7-2D5DA1C00F0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FFC47713-B417-43AD-B7D7-2D5DA1C00F0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FFC47713-B417-43AD-B7D7-2D5DA1C00F0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00BF602B-F709-4108-9A39-C57A493D3EF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00BF602B-F709-4108-9A39-C57A493D3EF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00BF602B-F709-4108-9A39-C57A493D3EF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00BF602B-F709-4108-9A39-C57A493D3EF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77720BB9-1319-4BF7-A2DB-B1FC3F20FD1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77720BB9-1319-4BF7-A2DB-B1FC3F20FD1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77720BB9-1319-4BF7-A2DB-B1FC3F20FD1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77720BB9-1319-4BF7-A2DB-B1FC3F20FD1F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15B66DCE-70BF-43D6-854D-42A6C840B22C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15B66DCE-70BF-43D6-854D-42A6C840B22C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15B66DCE-70BF-43D6-854D-42A6C840B22C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15B66DCE-70BF-43D6-854D-42A6C840B22C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC5371F7-FCD9-4BDE-8639-6DD5F3B71175}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE2A4103-7CA0-4DAD-A4AD-F623CBFAD379}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72B2CC3A-D66E-4F7E-BFA4-38EE373B5043}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82007016-ED8D-408E-BA83-DFB3F74B104F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82007016-ED8D-408E-BA83-DFB3F74B104F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82007016-ED8D-408E-BA83-DFB3F74B104F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82007016-ED8D-408E-BA83-DFB3F74B104F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3FC70CE-3746-4E03-A92F-0102716FA97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3FC70CE-3746-4E03-A92F-0102716FA97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3FC70CE-3746-4E03-A92F-0102716FA97E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3FC70CE-3746-4E03-A92F-0102716FA97E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D62E59F2-BDF3-4060-85E0-20D1BB41B95E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39B50FAE-211A-4C44-8FD0-2731C82580E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B50FAE-211A-4C44-8FD0-2731C82580E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B50FAE-211A-4C44-8FD0-2731C82580E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B50FAE-211A-4C44-8FD0-2731C82580E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{06B581E4-A15B-4B5B-93D1-3B0463D1A338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{06B581E4-A15B-4B5B-93D1-3B0463D1A338}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{06B581E4-A15B-4B5B-93D1-3B0463D1A338}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{06B581E4-A15B-4B5B-93D1-3B0463D1A338}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB254BF6-9C7C-4A35-A8B1-FB8832382442}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4FE5ECEE-ACC5-4558-A946-573426599B73} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F6D1C093-081D-46DE-B5A8-516533375FDD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{239347DB-D566-48C9-9551-28AB3AD12EC3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1714448C-211E-48C1-8B7E-4EE667D336A1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{324DF6B2-4234-47FF-A2C7-A739F19E8F17} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{FFC47713-B417-43AD-B7D7-2D5DA1C00F0D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A110D3B4-0478-4145-9931-FC130D4E7211}
+		SolutionGuid = {9CA07406-6BA5-454C-8C65-3396A977F8A8}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
index 7e9a49a81ab444..c6cc16f4659faa 100644
--- a/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
+++ b/src/libraries/System.Net.NetworkInformation/System.Net.NetworkInformation.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation.Functional.Tests", "tests\FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj", "{DCBB8805-4658-44BF-B5E8-B6714EC8936B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3CA89D6C-F8D1-4813-9775-F8D249686E31} = {3CA89D6C-F8D1-4813-9775-F8D249686E31}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F8166147-93CA-4985-8E1F-E10A31C9713A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation", "src\System.Net.NetworkInformation.csproj", "{3CA89D6C-F8D1-4813-9775-F8D249686E31}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B897C3BE-7162-44BB-8B81-7A2464C082A7} = {B897C3BE-7162-44BB-8B81-7A2464C082A7}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E4175FAA-1220-4C4E-B8D2-FF9FD0F7DA76}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation", "ref\System.Net.NetworkInformation.csproj", "{B897C3BE-7162-44BB-8B81-7A2464C082A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation", "ref\System.Net.NetworkInformation.csproj", "{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation", "src\System.Net.NetworkInformation.csproj", "{062F1189-143C-456B-A439-D9C1BE2DD640}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.NetworkInformation.Functional.Tests", "tests\FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj", "{A0F37A17-0D79-4A84-84CC-AEE604206F06}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{AFCAC7B0-8F58-4EFD-B39B-D80346519005}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1EBC1861-0CC0-45A6-9685-AF863383D81F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E0483B14-39A9-4340-AD94-4C69CEB3C46E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{5BB14868-7DC8-4410-A89D-A1EABD70A349}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D4CE0CB5-E335-4DA8-BC05-D43A6BE9751E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CAB4332E-CDA9-4C95-BE3A-F812AF5ACE60}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6B167DA0-3D09-4C77-AA51-79293DE8D8D9}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F8166147-93CA-4985-8E1F-E10A31C9713A} = {D4CE0CB5-E335-4DA8-BC05-D43A6BE9751E}
+		{A0F37A17-0D79-4A84-84CC-AEE604206F06} = {D4CE0CB5-E335-4DA8-BC05-D43A6BE9751E}
+		{E4175FAA-1220-4C4E-B8D2-FF9FD0F7DA76} = {CAB4332E-CDA9-4C95-BE3A-F812AF5ACE60}
+		{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713} = {CAB4332E-CDA9-4C95-BE3A-F812AF5ACE60}
+		{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A} = {CAB4332E-CDA9-4C95-BE3A-F812AF5ACE60}
+		{E0483B14-39A9-4340-AD94-4C69CEB3C46E} = {CAB4332E-CDA9-4C95-BE3A-F812AF5ACE60}
+		{5BB14868-7DC8-4410-A89D-A1EABD70A349} = {CAB4332E-CDA9-4C95-BE3A-F812AF5ACE60}
+		{062F1189-143C-456B-A439-D9C1BE2DD640} = {6B167DA0-3D09-4C77-AA51-79293DE8D8D9}
+		{1EBC1861-0CC0-45A6-9685-AF863383D81F} = {6B167DA0-3D09-4C77-AA51-79293DE8D8D9}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DCBB8805-4658-44BF-B5E8-B6714EC8936B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CA89D6C-F8D1-4813-9775-F8D249686E31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B897C3BE-7162-44BB-8B81-7A2464C082A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B897C3BE-7162-44BB-8B81-7A2464C082A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B897C3BE-7162-44BB-8B81-7A2464C082A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B897C3BE-7162-44BB-8B81-7A2464C082A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFCAC7B0-8F58-4EFD-B39B-D80346519005}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFCAC7B0-8F58-4EFD-B39B-D80346519005}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFCAC7B0-8F58-4EFD-B39B-D80346519005}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFCAC7B0-8F58-4EFD-B39B-D80346519005}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8166147-93CA-4985-8E1F-E10A31C9713A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8166147-93CA-4985-8E1F-E10A31C9713A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8166147-93CA-4985-8E1F-E10A31C9713A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8166147-93CA-4985-8E1F-E10A31C9713A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E4175FAA-1220-4C4E-B8D2-FF9FD0F7DA76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E4175FAA-1220-4C4E-B8D2-FF9FD0F7DA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E4175FAA-1220-4C4E-B8D2-FF9FD0F7DA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E4175FAA-1220-4C4E-B8D2-FF9FD0F7DA76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDF83CE6-22BB-45EA-B8CF-32AC2CFE5713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{062F1189-143C-456B-A439-D9C1BE2DD640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{062F1189-143C-456B-A439-D9C1BE2DD640}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{062F1189-143C-456B-A439-D9C1BE2DD640}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{062F1189-143C-456B-A439-D9C1BE2DD640}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0F37A17-0D79-4A84-84CC-AEE604206F06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23FF09C1-F2BF-4834-96CE-59BE5AA7F46A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EBC1861-0CC0-45A6-9685-AF863383D81F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EBC1861-0CC0-45A6-9685-AF863383D81F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EBC1861-0CC0-45A6-9685-AF863383D81F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EBC1861-0CC0-45A6-9685-AF863383D81F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0483B14-39A9-4340-AD94-4C69CEB3C46E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0483B14-39A9-4340-AD94-4C69CEB3C46E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0483B14-39A9-4340-AD94-4C69CEB3C46E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0483B14-39A9-4340-AD94-4C69CEB3C46E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BB14868-7DC8-4410-A89D-A1EABD70A349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BB14868-7DC8-4410-A89D-A1EABD70A349}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BB14868-7DC8-4410-A89D-A1EABD70A349}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BB14868-7DC8-4410-A89D-A1EABD70A349}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{DCBB8805-4658-44BF-B5E8-B6714EC8936B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3CA89D6C-F8D1-4813-9775-F8D249686E31} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B897C3BE-7162-44BB-8B81-7A2464C082A7} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{AFCAC7B0-8F58-4EFD-B39B-D80346519005} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F01C6CC9-5EDE-4C1F-8F65-2E03FF520A30}
+		SolutionGuid = {6749EC2E-042F-4132-9B0A-82ED7F56513C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Ping/System.Net.Ping.sln b/src/libraries/System.Net.Ping/System.Net.Ping.sln
index fe220d95b8d075..74cf24aaec62cd 100644
--- a/src/libraries/System.Net.Ping/System.Net.Ping.sln
+++ b/src/libraries/System.Net.Ping/System.Net.Ping.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping.Functional.Tests", "tests\FunctionalTests\System.Net.Ping.Functional.Tests.csproj", "{43CE20B7-389B-41BB-8390-447521DF3BD4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{85FD05E8-A4B1-4B89-ABED-33AFD200CABD} = {85FD05E8-A4B1-4B89-ABED-33AFD200CABD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{37231AFF-11DE-41E7-85A7-F23D136D254E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping", "src\System.Net.Ping.csproj", "{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{933C2AC2-1188-45D1-B0C1-08D6382DC0BE} = {933C2AC2-1188-45D1-B0C1-08D6382DC0BE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FD7585AD-9162-445C-AE46-C8D201783E6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping", "ref\System.Net.Ping.csproj", "{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping", "ref\System.Net.Ping.csproj", "{A16A6C85-DF86-44A1-9032-238C223A0AE0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping", "src\System.Net.Ping.csproj", "{65B08958-069E-4F8B-A996-2A987ACCAA49}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Ping.Functional.Tests", "tests\FunctionalTests\System.Net.Ping.Functional.Tests.csproj", "{E2A63467-3D66-448C-BF81-5DF684E02AD3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{948D0208-37D1-48B7-91AE-138D9A2C7751}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{32414BE5-0115-4393-8F5F-F7ABC3EC1905}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A4450C98-3F50-40E7-A4DE-BBEE9186BBA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2E973302-8A55-48F8-AFE1-69585525DD43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9318DE2E-B10E-403D-9BC2-8433D71A0F39}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4D0ECFB1-F9C6-4BDD-B303-C392011DAC03}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6FD77420-2E46-4A66-AABD-246A29228E7A}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{37231AFF-11DE-41E7-85A7-F23D136D254E} = {9318DE2E-B10E-403D-9BC2-8433D71A0F39}
+		{E2A63467-3D66-448C-BF81-5DF684E02AD3} = {9318DE2E-B10E-403D-9BC2-8433D71A0F39}
+		{FD7585AD-9162-445C-AE46-C8D201783E6D} = {4D0ECFB1-F9C6-4BDD-B303-C392011DAC03}
+		{A16A6C85-DF86-44A1-9032-238C223A0AE0} = {4D0ECFB1-F9C6-4BDD-B303-C392011DAC03}
+		{948D0208-37D1-48B7-91AE-138D9A2C7751} = {4D0ECFB1-F9C6-4BDD-B303-C392011DAC03}
+		{A4450C98-3F50-40E7-A4DE-BBEE9186BBA2} = {4D0ECFB1-F9C6-4BDD-B303-C392011DAC03}
+		{2E973302-8A55-48F8-AFE1-69585525DD43} = {4D0ECFB1-F9C6-4BDD-B303-C392011DAC03}
+		{65B08958-069E-4F8B-A996-2A987ACCAA49} = {6FD77420-2E46-4A66-AABD-246A29228E7A}
+		{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4} = {6FD77420-2E46-4A66-AABD-246A29228E7A}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{43CE20B7-389B-41BB-8390-447521DF3BD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43CE20B7-389B-41BB-8390-447521DF3BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43CE20B7-389B-41BB-8390-447521DF3BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43CE20B7-389B-41BB-8390-447521DF3BD4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{85FD05E8-A4B1-4B89-ABED-33AFD200CABD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{933C2AC2-1188-45D1-B0C1-08D6382DC0BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32414BE5-0115-4393-8F5F-F7ABC3EC1905}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32414BE5-0115-4393-8F5F-F7ABC3EC1905}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32414BE5-0115-4393-8F5F-F7ABC3EC1905}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32414BE5-0115-4393-8F5F-F7ABC3EC1905}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37231AFF-11DE-41E7-85A7-F23D136D254E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37231AFF-11DE-41E7-85A7-F23D136D254E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37231AFF-11DE-41E7-85A7-F23D136D254E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37231AFF-11DE-41E7-85A7-F23D136D254E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD7585AD-9162-445C-AE46-C8D201783E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD7585AD-9162-445C-AE46-C8D201783E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD7585AD-9162-445C-AE46-C8D201783E6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD7585AD-9162-445C-AE46-C8D201783E6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A16A6C85-DF86-44A1-9032-238C223A0AE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A16A6C85-DF86-44A1-9032-238C223A0AE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A16A6C85-DF86-44A1-9032-238C223A0AE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A16A6C85-DF86-44A1-9032-238C223A0AE0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65B08958-069E-4F8B-A996-2A987ACCAA49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65B08958-069E-4F8B-A996-2A987ACCAA49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65B08958-069E-4F8B-A996-2A987ACCAA49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65B08958-069E-4F8B-A996-2A987ACCAA49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2A63467-3D66-448C-BF81-5DF684E02AD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{948D0208-37D1-48B7-91AE-138D9A2C7751}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{948D0208-37D1-48B7-91AE-138D9A2C7751}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{948D0208-37D1-48B7-91AE-138D9A2C7751}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{948D0208-37D1-48B7-91AE-138D9A2C7751}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5C17482-80DE-4E7F-A4BB-E6D80CD5B2F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4450C98-3F50-40E7-A4DE-BBEE9186BBA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4450C98-3F50-40E7-A4DE-BBEE9186BBA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4450C98-3F50-40E7-A4DE-BBEE9186BBA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4450C98-3F50-40E7-A4DE-BBEE9186BBA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E973302-8A55-48F8-AFE1-69585525DD43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E973302-8A55-48F8-AFE1-69585525DD43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E973302-8A55-48F8-AFE1-69585525DD43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E973302-8A55-48F8-AFE1-69585525DD43}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{43CE20B7-389B-41BB-8390-447521DF3BD4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{85FD05E8-A4B1-4B89-ABED-33AFD200CABD} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{933C2AC2-1188-45D1-B0C1-08D6382DC0BE} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{32414BE5-0115-4393-8F5F-F7ABC3EC1905} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BEA60158-FDD1-493C-B511-B97F5CEAA877}
+		SolutionGuid = {23612E2C-7AC3-4D7B-812D-44BB88E94278}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
index c7b547d4a6674f..90c962e9f87fac 100644
--- a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
+++ b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln
@@ -1,80 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Functional.Tests", "tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj", "{E671BC9F-A64C-4504-8B00-7A3215B99AF9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8F70DCFE-9367-4427-9DFB-90C9C9D5D1B4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Pal.Tests", "tests\PalTests\System.Net.Primitives.Pal.Tests.csproj", "{7860A11A-1841-4416-8A30-28EEEB42C6BB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{F40E099B-A1CD-4B8A-B2E9-E7E294E4BFA3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.UnitTests.Tests", "tests\UnitTests\System.Net.Primitives.UnitTests.Tests.csproj", "{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives", "ref\System.Net.Primitives.csproj", "{9CCAA49E-21F5-407B-807F-A26A5F01FCF1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives", "src\System.Net.Primitives.csproj", "{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8} = {D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives", "src\System.Net.Primitives.csproj", "{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives", "ref\System.Net.Primitives.csproj", "{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Functional.Tests", "tests\FunctionalTests\System.Net.Primitives.Functional.Tests.csproj", "{AD1FDD2C-E553-4E7D-8D8F-945A1D520E28}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Pal.Tests", "tests\PalTests\System.Net.Primitives.Pal.Tests.csproj", "{3D1D85E0-1680-4B9E-89BC-AB80CE222620}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.UnitTests.Tests", "tests\UnitTests\System.Net.Primitives.UnitTests.Tests.csproj", "{598326BD-BCA8-48EC-A897-602DF1F247A3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F1989258-F5D7-4056-9831-518BD04F5863}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{23FB257B-BD10-4593-990E-ECB78A676038}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8C06D2A0-E74F-47CE-826C-74C6895E7D23}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D1F5690C-18B5-4CA9-A4B2-715DFEDDFF81}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DD2443D9-670F-4CB2-9389-ABE147FAEA84}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7F76EB2C-7CDA-4326-8C99-15F577092450}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1DE25CF0-0FE0-4F84-823B-DDAB13E2ECDC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8F70DCFE-9367-4427-9DFB-90C9C9D5D1B4} = {DD2443D9-670F-4CB2-9389-ABE147FAEA84}
+		{AD1FDD2C-E553-4E7D-8D8F-945A1D520E28} = {DD2443D9-670F-4CB2-9389-ABE147FAEA84}
+		{3D1D85E0-1680-4B9E-89BC-AB80CE222620} = {DD2443D9-670F-4CB2-9389-ABE147FAEA84}
+		{598326BD-BCA8-48EC-A897-602DF1F247A3} = {DD2443D9-670F-4CB2-9389-ABE147FAEA84}
+		{F40E099B-A1CD-4B8A-B2E9-E7E294E4BFA3} = {7F76EB2C-7CDA-4326-8C99-15F577092450}
+		{9CCAA49E-21F5-407B-807F-A26A5F01FCF1} = {7F76EB2C-7CDA-4326-8C99-15F577092450}
+		{F1989258-F5D7-4056-9831-518BD04F5863} = {7F76EB2C-7CDA-4326-8C99-15F577092450}
+		{8C06D2A0-E74F-47CE-826C-74C6895E7D23} = {7F76EB2C-7CDA-4326-8C99-15F577092450}
+		{D1F5690C-18B5-4CA9-A4B2-715DFEDDFF81} = {7F76EB2C-7CDA-4326-8C99-15F577092450}
+		{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE} = {1DE25CF0-0FE0-4F84-823B-DDAB13E2ECDC}
+		{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0} = {1DE25CF0-0FE0-4F84-823B-DDAB13E2ECDC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E671BC9F-A64C-4504-8B00-7A3215B99AF9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7860A11A-1841-4416-8A30-28EEEB42C6BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23FB257B-BD10-4593-990E-ECB78A676038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23FB257B-BD10-4593-990E-ECB78A676038}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23FB257B-BD10-4593-990E-ECB78A676038}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23FB257B-BD10-4593-990E-ECB78A676038}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F70DCFE-9367-4427-9DFB-90C9C9D5D1B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F70DCFE-9367-4427-9DFB-90C9C9D5D1B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F70DCFE-9367-4427-9DFB-90C9C9D5D1B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F70DCFE-9367-4427-9DFB-90C9C9D5D1B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F40E099B-A1CD-4B8A-B2E9-E7E294E4BFA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F40E099B-A1CD-4B8A-B2E9-E7E294E4BFA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F40E099B-A1CD-4B8A-B2E9-E7E294E4BFA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F40E099B-A1CD-4B8A-B2E9-E7E294E4BFA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CCAA49E-21F5-407B-807F-A26A5F01FCF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CCAA49E-21F5-407B-807F-A26A5F01FCF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CCAA49E-21F5-407B-807F-A26A5F01FCF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CCAA49E-21F5-407B-807F-A26A5F01FCF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08C53516-56AB-4D3B-B22F-7DC1B27EA7CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD1FDD2C-E553-4E7D-8D8F-945A1D520E28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD1FDD2C-E553-4E7D-8D8F-945A1D520E28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD1FDD2C-E553-4E7D-8D8F-945A1D520E28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD1FDD2C-E553-4E7D-8D8F-945A1D520E28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D1D85E0-1680-4B9E-89BC-AB80CE222620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D1D85E0-1680-4B9E-89BC-AB80CE222620}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D1D85E0-1680-4B9E-89BC-AB80CE222620}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D1D85E0-1680-4B9E-89BC-AB80CE222620}.Release|Any CPU.Build.0 = Release|Any CPU
+		{598326BD-BCA8-48EC-A897-602DF1F247A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{598326BD-BCA8-48EC-A897-602DF1F247A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{598326BD-BCA8-48EC-A897-602DF1F247A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{598326BD-BCA8-48EC-A897-602DF1F247A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1989258-F5D7-4056-9831-518BD04F5863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1989258-F5D7-4056-9831-518BD04F5863}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1989258-F5D7-4056-9831-518BD04F5863}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1989258-F5D7-4056-9831-518BD04F5863}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D5C59E4-66E7-4DC5-B1D5-711D5D3265C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C06D2A0-E74F-47CE-826C-74C6895E7D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C06D2A0-E74F-47CE-826C-74C6895E7D23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C06D2A0-E74F-47CE-826C-74C6895E7D23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C06D2A0-E74F-47CE-826C-74C6895E7D23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1F5690C-18B5-4CA9-A4B2-715DFEDDFF81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1F5690C-18B5-4CA9-A4B2-715DFEDDFF81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1F5690C-18B5-4CA9-A4B2-715DFEDDFF81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1F5690C-18B5-4CA9-A4B2-715DFEDDFF81}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E671BC9F-A64C-4504-8B00-7A3215B99AF9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7860A11A-1841-4416-8A30-28EEEB42C6BB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{FCFF9C63-CE7A-476E-8241-7B7236FFDBFB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D7A4CF9D-78AA-4140-83E3-6BC43EF2DBB8} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{23FB257B-BD10-4593-990E-ECB78A676038} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {ED70270A-6412-44A6-81B6-1156337C55DF}
+		SolutionGuid = {E0D36CFB-AD15-487D-A647-F12B577FC5DF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Quic/System.Net.Quic.sln b/src/libraries/System.Net.Quic/System.Net.Quic.sln
index cf5fba5e1115ff..3d6fa4fc85246c 100644
--- a/src/libraries/System.Net.Quic/System.Net.Quic.sln
+++ b/src/libraries/System.Net.Quic/System.Net.Quic.sln
@@ -1,53 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic.Functional.Tests", "tests\FunctionalTests\System.Net.Quic.Functional.Tests.csproj", "{C85CF035-7804-41FF-9557-48B7C948B58D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}
-	EndProjectSection
+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.Net.Quic", "src\System.Net.Quic.csproj", "{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {132BF813-FC40-4D39-8B6F-E55D7633F0ED}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{69CDCFD5-AA35-40D8-A437-ED1C06E9CA95}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "ref\System.Net.Quic.csproj", "{132BF813-FC40-4D39-8B6F-E55D7633F0ED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "ref\System.Net.Quic.csproj", "{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic", "src\System.Net.Quic.csproj", "{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Quic.Functional.Tests", "tests\FunctionalTests\System.Net.Quic.Functional.Tests.csproj", "{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7BB8C50D-4770-42CB-BE15-76AD623A5AE8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{833418C5-FEC9-482F-A0D6-69DFC332C1B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E1CABA2F-48AD-49FA-B872-BEED78C51980}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BDA10542-BE94-4A73-9B5B-6BE5CE57F883}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4BABFE90-C818-4772-9D2E-B92F69E1FCDF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DAC0D00A-6EB0-4A72-94BB-EB90B3EE72A9}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{55C933AA-2735-4B38-A1DD-01A27467AB18} = {BDA10542-BE94-4A73-9B5B-6BE5CE57F883}
+		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038} = {BDA10542-BE94-4A73-9B5B-6BE5CE57F883}
+		{69CDCFD5-AA35-40D8-A437-ED1C06E9CA95} = {4BABFE90-C818-4772-9D2E-B92F69E1FCDF}
+		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5} = {4BABFE90-C818-4772-9D2E-B92F69E1FCDF}
+		{7BB8C50D-4770-42CB-BE15-76AD623A5AE8} = {4BABFE90-C818-4772-9D2E-B92F69E1FCDF}
+		{833418C5-FEC9-482F-A0D6-69DFC332C1B6} = {4BABFE90-C818-4772-9D2E-B92F69E1FCDF}
+		{E1CABA2F-48AD-49FA-B872-BEED78C51980} = {4BABFE90-C818-4772-9D2E-B92F69E1FCDF}
+		{4F87758B-D1AF-4DE3-A9A2-68B1558C02B7} = {DAC0D00A-6EB0-4A72-94BB-EB90B3EE72A9}
+		{9D56BA9E-1B0D-4320-9FE9-A2D326A32BE0} = {DAC0D00A-6EB0-4A72-94BB-EB90B3EE72A9}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C85CF035-7804-41FF-9557-48B7C948B58D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED}.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
+		{69CDCFD5-AA35-40D8-A437-ED1C06E9CA95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69CDCFD5-AA35-40D8-A437-ED1C06E9CA95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69CDCFD5-AA35-40D8-A437-ED1C06E9CA95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69CDCFD5-AA35-40D8-A437-ED1C06E9CA95}.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
+		{D7A52855-C6DE-4FD0-9CAF-E55F292C69E5}.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
+		{E8E7DD3A-EC3F-4472-9F70-B515A3D11038}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{833418C5-FEC9-482F-A0D6-69DFC332C1B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{833418C5-FEC9-482F-A0D6-69DFC332C1B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{833418C5-FEC9-482F-A0D6-69DFC332C1B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{833418C5-FEC9-482F-A0D6-69DFC332C1B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1CABA2F-48AD-49FA-B872-BEED78C51980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1CABA2F-48AD-49FA-B872-BEED78C51980}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1CABA2F-48AD-49FA-B872-BEED78C51980}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1CABA2F-48AD-49FA-B872-BEED78C51980}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C85CF035-7804-41FF-9557-48B7C948B58D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{132BF813-FC40-4D39-8B6F-E55D7633F0ED} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5100F629-0FAB-4C6F-9A54-95AE9565EE0D}
+		SolutionGuid = {4B59ACCA-7F0C-4062-AA79-B3D75EFACCCD}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Requests/System.Net.Requests.sln b/src/libraries/System.Net.Requests/System.Net.Requests.sln
index 892a4809b70f04..65301351f36823 100644
--- a/src/libraries/System.Net.Requests/System.Net.Requests.sln
+++ b/src/libraries/System.Net.Requests/System.Net.Requests.sln
@@ -1,60 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests.Tests", "tests\System.Net.Requests.Tests.csproj", "{E520B5FD-C6FF-46CF-8079-6C8098013EA3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F} = {5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{050A566C-C468-4AFB-84E4-FFC421983961}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests", "src\System.Net.Requests.csproj", "{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F86C715C-E37B-4853-869E-D696AB3DB057} = {F86C715C-E37B-4853-869E-D696AB3DB057}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{795C417F-4C60-4D41-B8B3-A993AF95D87D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests", "ref\System.Net.Requests.csproj", "{F86C715C-E37B-4853-869E-D696AB3DB057}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests", "ref\System.Net.Requests.csproj", "{60B3EE55-D545-4817-A57D-99F38CBCD1A8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests", "src\System.Net.Requests.csproj", "{CCD28DAE-FEF6-4732-A985-B814A95B3408}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Requests.Tests", "tests\System.Net.Requests.Tests.csproj", "{45338E1A-5586-40E6-97AF-709DBBB85AEC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4EC53679-7072-4827-A166-0222A076C358}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B0F5B1D3-AD4E-4FB4-B35C-414BEB5B1D9E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{BADB548A-7A51-4B52-8498-69B6C0A1FD77}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{47150272-2C30-4431-A492-73B37276D8FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{9D14A15A-A8F3-4FE9-91CC-1B9CEA484B6A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BE561981-8140-4E5F-B0B2-206FF98DC51F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CFDAD3E9-6754-4B65-A755-8368E9C7C5C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5ED8235D-B875-451C-9A74-B28F2FB4D813}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{050A566C-C468-4AFB-84E4-FFC421983961} = {BE561981-8140-4E5F-B0B2-206FF98DC51F}
+		{45338E1A-5586-40E6-97AF-709DBBB85AEC} = {BE561981-8140-4E5F-B0B2-206FF98DC51F}
+		{795C417F-4C60-4D41-B8B3-A993AF95D87D} = {CFDAD3E9-6754-4B65-A755-8368E9C7C5C5}
+		{60B3EE55-D545-4817-A57D-99F38CBCD1A8} = {CFDAD3E9-6754-4B65-A755-8368E9C7C5C5}
+		{4EC53679-7072-4827-A166-0222A076C358} = {CFDAD3E9-6754-4B65-A755-8368E9C7C5C5}
+		{47150272-2C30-4431-A492-73B37276D8FA} = {CFDAD3E9-6754-4B65-A755-8368E9C7C5C5}
+		{9D14A15A-A8F3-4FE9-91CC-1B9CEA484B6A} = {CFDAD3E9-6754-4B65-A755-8368E9C7C5C5}
+		{CCD28DAE-FEF6-4732-A985-B814A95B3408} = {5ED8235D-B875-451C-9A74-B28F2FB4D813}
+		{BADB548A-7A51-4B52-8498-69B6C0A1FD77} = {5ED8235D-B875-451C-9A74-B28F2FB4D813}
+		{6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4} = {5ED8235D-B875-451C-9A74-B28F2FB4D813}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E520B5FD-C6FF-46CF-8079-6C8098013EA3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F86C715C-E37B-4853-869E-D696AB3DB057}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F86C715C-E37B-4853-869E-D696AB3DB057}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F86C715C-E37B-4853-869E-D696AB3DB057}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F86C715C-E37B-4853-869E-D696AB3DB057}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0F5B1D3-AD4E-4FB4-B35C-414BEB5B1D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0F5B1D3-AD4E-4FB4-B35C-414BEB5B1D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0F5B1D3-AD4E-4FB4-B35C-414BEB5B1D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0F5B1D3-AD4E-4FB4-B35C-414BEB5B1D9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{050A566C-C468-4AFB-84E4-FFC421983961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{050A566C-C468-4AFB-84E4-FFC421983961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{050A566C-C468-4AFB-84E4-FFC421983961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{050A566C-C468-4AFB-84E4-FFC421983961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{795C417F-4C60-4D41-B8B3-A993AF95D87D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{795C417F-4C60-4D41-B8B3-A993AF95D87D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{795C417F-4C60-4D41-B8B3-A993AF95D87D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{795C417F-4C60-4D41-B8B3-A993AF95D87D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{60B3EE55-D545-4817-A57D-99F38CBCD1A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60B3EE55-D545-4817-A57D-99F38CBCD1A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60B3EE55-D545-4817-A57D-99F38CBCD1A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60B3EE55-D545-4817-A57D-99F38CBCD1A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCD28DAE-FEF6-4732-A985-B814A95B3408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCD28DAE-FEF6-4732-A985-B814A95B3408}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCD28DAE-FEF6-4732-A985-B814A95B3408}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCD28DAE-FEF6-4732-A985-B814A95B3408}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45338E1A-5586-40E6-97AF-709DBBB85AEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EC53679-7072-4827-A166-0222A076C358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EC53679-7072-4827-A166-0222A076C358}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EC53679-7072-4827-A166-0222A076C358}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EC53679-7072-4827-A166-0222A076C358}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BADB548A-7A51-4B52-8498-69B6C0A1FD77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47150272-2C30-4431-A492-73B37276D8FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47150272-2C30-4431-A492-73B37276D8FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47150272-2C30-4431-A492-73B37276D8FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47150272-2C30-4431-A492-73B37276D8FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D14A15A-A8F3-4FE9-91CC-1B9CEA484B6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D14A15A-A8F3-4FE9-91CC-1B9CEA484B6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D14A15A-A8F3-4FE9-91CC-1B9CEA484B6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D14A15A-A8F3-4FE9-91CC-1B9CEA484B6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D8841E2-0FE2-4476-BE4B-5BC29D85AAE4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E520B5FD-C6FF-46CF-8079-6C8098013EA3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5EE76DCC-9FD5-47FD-AB45-BD0F0857740F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F86C715C-E37B-4853-869E-D696AB3DB057} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{B0F5B1D3-AD4E-4FB4-B35C-414BEB5B1D9E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {05B55060-524A-407F-A69E-BD06F6EBCFF3}
+		SolutionGuid = {D33CD477-CBDE-47CC-BDAB-7E9469CE3549}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Security/System.Net.Security.sln b/src/libraries/System.Net.Security/System.Net.Security.sln
index f3222d308933ec..6ca2cc55112af6 100644
--- a/src/libraries/System.Net.Security/System.Net.Security.sln
+++ b/src/libraries/System.Net.Security/System.Net.Security.sln
@@ -1,70 +1,128 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security.Tests", "tests\FunctionalTests\System.Net.Security.Tests.csproj", "{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771} = {89F37791-6254-4D60-AB96-ACD3CCA0E771}
-	EndProjectSection
+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.Net.Security.Unit.Tests", "tests\UnitTests\System.Net.Security.Unit.Tests.csproj", "{0D174EA9-9E61-4519-8D31-7BD2331A1982}"
-	ProjectSection(ProjectDependencies) = postProject
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771} = {89F37791-6254-4D60-AB96-ACD3CCA0E771}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{5BDA6E43-2F8B-4C1A-97B1-CB4DB07CE5F1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security", "src\System.Net.Security.csproj", "{89F37791-6254-4D60-AB96-ACD3CCA0E771}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8} = {A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}
-	EndProjectSection
+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", "{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security", "ref\System.Net.Security.csproj", "{97493212-ADF3-46AF-8669-F038964CDA22}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security", "src\System.Net.Security.csproj", "{20F20695-DB18-47EB-A005-AA432ADCF865}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security.Enterprise.Tests", "tests\EnterpriseTests\System.Net.Security.Enterprise.Tests.csproj", "{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security.Tests", "tests\FunctionalTests\System.Net.Security.Tests.csproj", "{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3C4504D2-95D0-4F41-9BC7-8335C3A0CF59}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Security.Unit.Tests", "tests\UnitTests\System.Net.Security.Unit.Tests.csproj", "{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{4379D1FD-1473-4F17-9AC6-85B02EA83250}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{754403CE-ECFC-4EBA-8540-BEB67476FF9F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{EFC33B10-5B46-4529-B70D-B4A50D36534A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\ref\System.Security.Cryptography.OpenSsl.csproj", "{B65FD865-2DDA-468F-82AE-39E7EDBBB142}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{E0D760D1-21BC-468F-B599-858ECFF4AB1D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2D2AF982-F335-4326-A07D-43DF801D1FB9}"
+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", "{8E18C47A-BFA7-4D32-ABD1-DECCA3D35C8F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{AE1750EC-129B-4EBE-B1A1-0E320044389B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DF50962D-38D3-4E65-ABD5-FBAC1E8E22A8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{16B2F746-485C-4A15-883E-ABF2C885DD2A} = {8E18C47A-BFA7-4D32-ABD1-DECCA3D35C8F}
+		{3B8B3E64-BF3B-46E6-8203-AA6D7D6A0F6D} = {8E18C47A-BFA7-4D32-ABD1-DECCA3D35C8F}
+		{39FCDE49-DBC3-442B-8B3E-8A5FDCAE8B28} = {8E18C47A-BFA7-4D32-ABD1-DECCA3D35C8F}
+		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA} = {8E18C47A-BFA7-4D32-ABD1-DECCA3D35C8F}
+		{5BDA6E43-2F8B-4C1A-97B1-CB4DB07CE5F1} = {AE1750EC-129B-4EBE-B1A1-0E320044389B}
+		{97493212-ADF3-46AF-8669-F038964CDA22} = {AE1750EC-129B-4EBE-B1A1-0E320044389B}
+		{4379D1FD-1473-4F17-9AC6-85B02EA83250} = {AE1750EC-129B-4EBE-B1A1-0E320044389B}
+		{EFC33B10-5B46-4529-B70D-B4A50D36534A} = {AE1750EC-129B-4EBE-B1A1-0E320044389B}
+		{B65FD865-2DDA-468F-82AE-39E7EDBBB142} = {AE1750EC-129B-4EBE-B1A1-0E320044389B}
+		{2D2AF982-F335-4326-A07D-43DF801D1FB9} = {AE1750EC-129B-4EBE-B1A1-0E320044389B}
+		{441D4079-55B4-4C47-A0E5-1330DC9A31CB} = {DF50962D-38D3-4E65-ABD5-FBAC1E8E22A8}
+		{20F20695-DB18-47EB-A005-AA432ADCF865} = {DF50962D-38D3-4E65-ABD5-FBAC1E8E22A8}
+		{754403CE-ECFC-4EBA-8540-BEB67476FF9F} = {DF50962D-38D3-4E65-ABD5-FBAC1E8E22A8}
+		{E0D760D1-21BC-468F-B599-858ECFF4AB1D} = {DF50962D-38D3-4E65-ABD5-FBAC1E8E22A8}
+		{80F5CE39-D33D-4CDD-ACD2-FA7597B6CBB1} = {DF50962D-38D3-4E65-ABD5-FBAC1E8E22A8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D174EA9-9E61-4519-8D31-7BD2331A1982}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C4504D2-95D0-4F41-9BC7-8335C3A0CF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C4504D2-95D0-4F41-9BC7-8335C3A0CF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C4504D2-95D0-4F41-9BC7-8335C3A0CF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C4504D2-95D0-4F41-9BC7-8335C3A0CF59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16B2F746-485C-4A15-883E-ABF2C885DD2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{5BDA6E43-2F8B-4C1A-97B1-CB4DB07CE5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BDA6E43-2F8B-4C1A-97B1-CB4DB07CE5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BDA6E43-2F8B-4C1A-97B1-CB4DB07CE5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BDA6E43-2F8B-4C1A-97B1-CB4DB07CE5F1}.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
+		{441D4079-55B4-4C47-A0E5-1330DC9A31CB}.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
+		{20F20695-DB18-47EB-A005-AA432ADCF865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20F20695-DB18-47EB-A005-AA432ADCF865}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20F20695-DB18-47EB-A005-AA432ADCF865}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20F20695-DB18-47EB-A005-AA432ADCF865}.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
+		{E67AFB3A-4DEC-48A3-9B78-02FFAC7FF0EA}.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
+		{4379D1FD-1473-4F17-9AC6-85B02EA83250}.Release|Any CPU.Build.0 = Release|Any CPU
+		{754403CE-ECFC-4EBA-8540-BEB67476FF9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{EFC33B10-5B46-4529-B70D-B4A50D36534A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFC33B10-5B46-4529-B70D-B4A50D36534A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFC33B10-5B46-4529-B70D-B4A50D36534A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFC33B10-5B46-4529-B70D-B4A50D36534A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B65FD865-2DDA-468F-82AE-39E7EDBBB142}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B65FD865-2DDA-468F-82AE-39E7EDBBB142}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B65FD865-2DDA-468F-82AE-39E7EDBBB142}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B65FD865-2DDA-468F-82AE-39E7EDBBB142}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0D760D1-21BC-468F-B599-858ECFF4AB1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{2D2AF982-F335-4326-A07D-43DF801D1FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D2AF982-F335-4326-A07D-43DF801D1FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D2AF982-F335-4326-A07D-43DF801D1FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D2AF982-F335-4326-A07D-43DF801D1FB9}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A55A2B9A-830F-4330-A0E7-02A9FB30ABD2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0D174EA9-9E61-4519-8D31-7BD2331A1982} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{89F37791-6254-4D60-AB96-ACD3CCA0E771} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{A7488FC0-9A8F-4EF9-BC3E-C5EBA47E13F8} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3C4504D2-95D0-4F41-9BC7-8335C3A0CF59} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5681D01F-0E3B-4BB3-9251-B78F91819933}
+		SolutionGuid = {4803416B-CE32-4730-905F-645A9B766D2B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
index 79b72b370b37fe..d469c1a093b331 100644
--- a/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
+++ b/src/libraries/System.Net.ServicePoint/System.Net.ServicePoint.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint.Tests", "tests\System.Net.ServicePoint.Tests.csproj", "{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3} = {AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1A05E494-230E-439C-9912-33B1A01D0A31}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint", "src\System.Net.ServicePoint.csproj", "{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{273A0AE8-6298-4382-9572-E39ACEB458A0} = {273A0AE8-6298-4382-9572-E39ACEB458A0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{AFDD949B-F3EE-487E-A0D0-8EC79CE4EC8D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint", "ref\System.Net.ServicePoint.csproj", "{273A0AE8-6298-4382-9572-E39ACEB458A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint", "ref\System.Net.ServicePoint.csproj", "{024702F2-6C9B-483E-A229-22F8FB97517C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint", "src\System.Net.ServicePoint.csproj", "{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.ServicePoint.Tests", "tests\System.Net.ServicePoint.Tests.csproj", "{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C542898D-30FA-4F30-B440-84116642DC97}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1177A8A7-6548-4227-A342-176235C265D7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{911D1E25-6359-452E-B1B3-900A8BF68532}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{1EB51DBF-B7C8-4C55-81DA-9566C5A64393}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F1E9E414-4398-4867-B059-A89975DF1CB6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E066E627-8939-403E-8296-8EADF4FDF3A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{511570D0-A027-4F79-B093-2F3E1E63525B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6D0D9659-467D-4424-9E96-A12BE5226064}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1A05E494-230E-439C-9912-33B1A01D0A31} = {E066E627-8939-403E-8296-8EADF4FDF3A2}
+		{550C82C8-F7C2-4EB6-B2C0-87523C2E6640} = {E066E627-8939-403E-8296-8EADF4FDF3A2}
+		{AFDD949B-F3EE-487E-A0D0-8EC79CE4EC8D} = {511570D0-A027-4F79-B093-2F3E1E63525B}
+		{024702F2-6C9B-483E-A229-22F8FB97517C} = {511570D0-A027-4F79-B093-2F3E1E63525B}
+		{C542898D-30FA-4F30-B440-84116642DC97} = {511570D0-A027-4F79-B093-2F3E1E63525B}
+		{1EB51DBF-B7C8-4C55-81DA-9566C5A64393} = {511570D0-A027-4F79-B093-2F3E1E63525B}
+		{F1E9E414-4398-4867-B059-A89975DF1CB6} = {511570D0-A027-4F79-B093-2F3E1E63525B}
+		{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A} = {6D0D9659-467D-4424-9E96-A12BE5226064}
+		{911D1E25-6359-452E-B1B3-900A8BF68532} = {6D0D9659-467D-4424-9E96-A12BE5226064}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{273A0AE8-6298-4382-9572-E39ACEB458A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{273A0AE8-6298-4382-9572-E39ACEB458A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{273A0AE8-6298-4382-9572-E39ACEB458A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{273A0AE8-6298-4382-9572-E39ACEB458A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1177A8A7-6548-4227-A342-176235C265D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1177A8A7-6548-4227-A342-176235C265D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1177A8A7-6548-4227-A342-176235C265D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1177A8A7-6548-4227-A342-176235C265D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A05E494-230E-439C-9912-33B1A01D0A31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A05E494-230E-439C-9912-33B1A01D0A31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1A05E494-230E-439C-9912-33B1A01D0A31}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A05E494-230E-439C-9912-33B1A01D0A31}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFDD949B-F3EE-487E-A0D0-8EC79CE4EC8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFDD949B-F3EE-487E-A0D0-8EC79CE4EC8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFDD949B-F3EE-487E-A0D0-8EC79CE4EC8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFDD949B-F3EE-487E-A0D0-8EC79CE4EC8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{024702F2-6C9B-483E-A229-22F8FB97517C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{024702F2-6C9B-483E-A229-22F8FB97517C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{024702F2-6C9B-483E-A229-22F8FB97517C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{024702F2-6C9B-483E-A229-22F8FB97517C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AE6973A-7E59-4F78-8B3F-FFBFEF38D89A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{550C82C8-F7C2-4EB6-B2C0-87523C2E6640}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C542898D-30FA-4F30-B440-84116642DC97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C542898D-30FA-4F30-B440-84116642DC97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C542898D-30FA-4F30-B440-84116642DC97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C542898D-30FA-4F30-B440-84116642DC97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{911D1E25-6359-452E-B1B3-900A8BF68532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{911D1E25-6359-452E-B1B3-900A8BF68532}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{911D1E25-6359-452E-B1B3-900A8BF68532}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{911D1E25-6359-452E-B1B3-900A8BF68532}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EB51DBF-B7C8-4C55-81DA-9566C5A64393}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EB51DBF-B7C8-4C55-81DA-9566C5A64393}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EB51DBF-B7C8-4C55-81DA-9566C5A64393}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EB51DBF-B7C8-4C55-81DA-9566C5A64393}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1E9E414-4398-4867-B059-A89975DF1CB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1E9E414-4398-4867-B059-A89975DF1CB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1E9E414-4398-4867-B059-A89975DF1CB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1E9E414-4398-4867-B059-A89975DF1CB6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{DC3BBD1F-37C8-40B2-B248-E12E8D0D146B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AD68DD5E-DEBF-48A0-B619-FBF65F502BC3} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{273A0AE8-6298-4382-9572-E39ACEB458A0} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{1177A8A7-6548-4227-A342-176235C265D7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8123B8CF-5D6E-4E2E-9665-C42DF84583F9}
+		SolutionGuid = {2DB03DED-414C-43AC-A6FD-748FEB8492EB}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
index 0a7ca12783d776..eddddc0213fd88 100644
--- a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
+++ b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln
@@ -1,60 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29721.122
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Tests", "tests\FunctionalTests\System.Net.Sockets.Tests.csproj", "{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {43311AFB-D7C4-4E5A-B1DE-855407F90D1B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets", "src\System.Net.Sockets.csproj", "{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{834E3534-6A11-4A8D-923F-35C1E71CCEC3} = {834E3534-6A11-4A8D-923F-35C1E71CCEC3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D42990B6-304B-4B4A-8D6D-87984F34CFE1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets", "ref\System.Net.Sockets.csproj", "{834E3534-6A11-4A8D-923F-35C1E71CCEC3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets", "ref\System.Net.Sockets.csproj", "{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets", "src\System.Net.Sockets.csproj", "{FD313302-FE04-414E-8A62-3BC8894115C1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Tests", "tests\FunctionalTests\System.Net.Sockets.Tests.csproj", "{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C746C235-7771-46F2-80B3-A67E0C62E436}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5BE7D6FF-0B45-4D54-B831-7EEA1EBAF40E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3234071E-7F94-4471-8D29-F376DACD8130}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{409C2A8A-664D-47FE-90B7-019ABCC79111}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{82926A80-3AE9-4739-A4E2-6B309234D5D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{BB5EAF65-3E22-4872-91CF-D33ACF12A6F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A2F4B32C-FB25-48FB-BE4D-060677BAF635}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{089E56CC-B717-4B90-84DF-F2932B6635CC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EC8CA334-FA4B-4D25-88CF-405BEA3B0B42}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0} = {A2F4B32C-FB25-48FB-BE4D-060677BAF635}
+		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2} = {A2F4B32C-FB25-48FB-BE4D-060677BAF635}
+		{D42990B6-304B-4B4A-8D6D-87984F34CFE1} = {089E56CC-B717-4B90-84DF-F2932B6635CC}
+		{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1} = {089E56CC-B717-4B90-84DF-F2932B6635CC}
+		{C746C235-7771-46F2-80B3-A67E0C62E436} = {089E56CC-B717-4B90-84DF-F2932B6635CC}
+		{409C2A8A-664D-47FE-90B7-019ABCC79111} = {089E56CC-B717-4B90-84DF-F2932B6635CC}
+		{82926A80-3AE9-4739-A4E2-6B309234D5D5} = {089E56CC-B717-4B90-84DF-F2932B6635CC}
+		{FD313302-FE04-414E-8A62-3BC8894115C1} = {EC8CA334-FA4B-4D25-88CF-405BEA3B0B42}
+		{3234071E-7F94-4471-8D29-F376DACD8130} = {EC8CA334-FA4B-4D25-88CF-405BEA3B0B42}
+		{BB5EAF65-3E22-4872-91CF-D33ACF12A6F1} = {EC8CA334-FA4B-4D25-88CF-405BEA3B0B42}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{834E3534-6A11-4A8D-923F-35C1E71CCEC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BE7D6FF-0B45-4D54-B831-7EEA1EBAF40E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BE7D6FF-0B45-4D54-B831-7EEA1EBAF40E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BE7D6FF-0B45-4D54-B831-7EEA1EBAF40E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BE7D6FF-0B45-4D54-B831-7EEA1EBAF40E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D42990B6-304B-4B4A-8D6D-87984F34CFE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D42990B6-304B-4B4A-8D6D-87984F34CFE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D42990B6-304B-4B4A-8D6D-87984F34CFE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D42990B6-304B-4B4A-8D6D-87984F34CFE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD313302-FE04-414E-8A62-3BC8894115C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD313302-FE04-414E-8A62-3BC8894115C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD313302-FE04-414E-8A62-3BC8894115C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD313302-FE04-414E-8A62-3BC8894115C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C746C235-7771-46F2-80B3-A67E0C62E436}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C746C235-7771-46F2-80B3-A67E0C62E436}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C746C235-7771-46F2-80B3-A67E0C62E436}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C746C235-7771-46F2-80B3-A67E0C62E436}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3234071E-7F94-4471-8D29-F376DACD8130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3234071E-7F94-4471-8D29-F376DACD8130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3234071E-7F94-4471-8D29-F376DACD8130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3234071E-7F94-4471-8D29-F376DACD8130}.Release|Any CPU.Build.0 = Release|Any CPU
+		{409C2A8A-664D-47FE-90B7-019ABCC79111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{409C2A8A-664D-47FE-90B7-019ABCC79111}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{409C2A8A-664D-47FE-90B7-019ABCC79111}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{409C2A8A-664D-47FE-90B7-019ABCC79111}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82926A80-3AE9-4739-A4E2-6B309234D5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82926A80-3AE9-4739-A4E2-6B309234D5D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82926A80-3AE9-4739-A4E2-6B309234D5D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82926A80-3AE9-4739-A4E2-6B309234D5D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB5EAF65-3E22-4872-91CF-D33ACF12A6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB5EAF65-3E22-4872-91CF-D33ACF12A6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB5EAF65-3E22-4872-91CF-D33ACF12A6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB5EAF65-3E22-4872-91CF-D33ACF12A6F1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8CBA022C-635F-4C8D-9D29-CD8AAC68C8E6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{834E3534-6A11-4A8D-923F-35C1E71CCEC3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{5BE7D6FF-0B45-4D54-B831-7EEA1EBAF40E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6E33D5E2-B9BF-49D1-99FA-3C9AC3412636}
+		SolutionGuid = {BA222465-FBD4-4377-8A8A-783BF85E01F7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
index 4275afa56d2c5c..aca45419e20a5b 100644
--- a/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
+++ b/src/libraries/System.Net.WebClient/System.Net.WebClient.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient.Tests", "tests\System.Net.WebClient.Tests.csproj", "{D2348221-084D-4076-91BF-C24D28E7D386}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EA25218A-0470-44CC-BDF0-3E74D5848BD8} = {EA25218A-0470-44CC-BDF0-3E74D5848BD8}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C2828D1D-8EBC-4971-91F9-3FF259066D01}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient", "src\System.Net.WebClient.csproj", "{EA25218A-0470-44CC-BDF0-3E74D5848BD8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45} = {03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E0BB2749-DD10-43D9-A8DB-F72A8D2424CD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient", "ref\System.Net.WebClient.csproj", "{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient", "ref\System.Net.WebClient.csproj", "{F1689AFC-F672-4407-B5C9-3515C301CF31}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient", "src\System.Net.WebClient.csproj", "{18F1E6CD-3568-4042-9EC3-6430FD60EC3A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebClient.Tests", "tests\System.Net.WebClient.Tests.csproj", "{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8DBDE7C2-5866-409F-B3BB-9C8B506F1003}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{36E7ABB6-B312-4826-A16F-6391B4C36265}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{39B64124-E091-48D6-B3CB-B358AE7788EE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{80561BDE-49C3-451B-9B27-29A68D789AE3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{FA3F6156-19AE-4A14-836A-4E544F8CAE82}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CB2BA4CC-A572-4FF5-B49C-11CE86BFCA20}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{45C71015-7D4B-415A-A5B1-82101F4E6107}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3685AD2E-E4D3-40EA-A291-310D651CB47D}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C2828D1D-8EBC-4971-91F9-3FF259066D01} = {CB2BA4CC-A572-4FF5-B49C-11CE86BFCA20}
+		{F9889BAD-7D20-4581-9F91-7490EBF5F9CA} = {CB2BA4CC-A572-4FF5-B49C-11CE86BFCA20}
+		{E0BB2749-DD10-43D9-A8DB-F72A8D2424CD} = {45C71015-7D4B-415A-A5B1-82101F4E6107}
+		{F1689AFC-F672-4407-B5C9-3515C301CF31} = {45C71015-7D4B-415A-A5B1-82101F4E6107}
+		{8DBDE7C2-5866-409F-B3BB-9C8B506F1003} = {45C71015-7D4B-415A-A5B1-82101F4E6107}
+		{80561BDE-49C3-451B-9B27-29A68D789AE3} = {45C71015-7D4B-415A-A5B1-82101F4E6107}
+		{FA3F6156-19AE-4A14-836A-4E544F8CAE82} = {45C71015-7D4B-415A-A5B1-82101F4E6107}
+		{18F1E6CD-3568-4042-9EC3-6430FD60EC3A} = {3685AD2E-E4D3-40EA-A291-310D651CB47D}
+		{39B64124-E091-48D6-B3CB-B358AE7788EE} = {3685AD2E-E4D3-40EA-A291-310D651CB47D}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D2348221-084D-4076-91BF-C24D28E7D386}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2348221-084D-4076-91BF-C24D28E7D386}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2348221-084D-4076-91BF-C24D28E7D386}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2348221-084D-4076-91BF-C24D28E7D386}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EA25218A-0470-44CC-BDF0-3E74D5848BD8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36E7ABB6-B312-4826-A16F-6391B4C36265}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36E7ABB6-B312-4826-A16F-6391B4C36265}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36E7ABB6-B312-4826-A16F-6391B4C36265}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36E7ABB6-B312-4826-A16F-6391B4C36265}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2828D1D-8EBC-4971-91F9-3FF259066D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2828D1D-8EBC-4971-91F9-3FF259066D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2828D1D-8EBC-4971-91F9-3FF259066D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2828D1D-8EBC-4971-91F9-3FF259066D01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0BB2749-DD10-43D9-A8DB-F72A8D2424CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0BB2749-DD10-43D9-A8DB-F72A8D2424CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0BB2749-DD10-43D9-A8DB-F72A8D2424CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0BB2749-DD10-43D9-A8DB-F72A8D2424CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1689AFC-F672-4407-B5C9-3515C301CF31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1689AFC-F672-4407-B5C9-3515C301CF31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1689AFC-F672-4407-B5C9-3515C301CF31}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1689AFC-F672-4407-B5C9-3515C301CF31}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18F1E6CD-3568-4042-9EC3-6430FD60EC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18F1E6CD-3568-4042-9EC3-6430FD60EC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18F1E6CD-3568-4042-9EC3-6430FD60EC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18F1E6CD-3568-4042-9EC3-6430FD60EC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9889BAD-7D20-4581-9F91-7490EBF5F9CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DBDE7C2-5866-409F-B3BB-9C8B506F1003}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39B64124-E091-48D6-B3CB-B358AE7788EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39B64124-E091-48D6-B3CB-B358AE7788EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39B64124-E091-48D6-B3CB-B358AE7788EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39B64124-E091-48D6-B3CB-B358AE7788EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80561BDE-49C3-451B-9B27-29A68D789AE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80561BDE-49C3-451B-9B27-29A68D789AE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80561BDE-49C3-451B-9B27-29A68D789AE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80561BDE-49C3-451B-9B27-29A68D789AE3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA3F6156-19AE-4A14-836A-4E544F8CAE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA3F6156-19AE-4A14-836A-4E544F8CAE82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA3F6156-19AE-4A14-836A-4E544F8CAE82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA3F6156-19AE-4A14-836A-4E544F8CAE82}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D2348221-084D-4076-91BF-C24D28E7D386} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{EA25218A-0470-44CC-BDF0-3E74D5848BD8} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{03D6021D-CB0B-43BD-83A5-7FDEDB39AE45} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{36E7ABB6-B312-4826-A16F-6391B4C36265} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5B937922-D833-49BA-8532-EF076BE10482}
+		SolutionGuid = {22B7F474-635F-4C3B-A730-3BBE6C176F12}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
index 6a9e0291d1f935..c898e17b01f9c2 100644
--- a/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
+++ b/src/libraries/System.Net.WebHeaderCollection/System.Net.WebHeaderCollection.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection.Tests", "tests\System.Net.WebHeaderCollection.Tests.csproj", "{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7DB0DF2-9CF2-42FB-89A7-450550B52C48} = {C7DB0DF2-9CF2-42FB-89A7-450550B52C48}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection", "src\System.Net.WebHeaderCollection.csproj", "{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2} = {99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7BD9E469-1854-4D21-B7FB-74C98A7D2361}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection", "ref\System.Net.WebHeaderCollection.csproj", "{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection", "ref\System.Net.WebHeaderCollection.csproj", "{2050FA72-2FB5-4057-B33A-7716064BE254}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection", "src\System.Net.WebHeaderCollection.csproj", "{0C54036A-68E7-4D87-AE77-72279D8DC116}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebHeaderCollection.Tests", "tests\System.Net.WebHeaderCollection.Tests.csproj", "{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7B2FD545-81F8-4604-825A-070AAB9A01CA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F475AC54-2107-4CBB-9C91-EE668E770DFB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D0417262-7CF9-4DCB-8738-9294EF18C71A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{7F7BB520-112B-4C69-B32C-EEE7C64CB449}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{911C4A6D-9202-4D5B-9F79-4264480BE8DD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{42F44289-A9B4-4970-ABAD-D53900F92E56}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A5240341-B58B-4B3C-BC2A-51048E1CE0E6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3} = {911C4A6D-9202-4D5B-9F79-4264480BE8DD}
+		{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76} = {911C4A6D-9202-4D5B-9F79-4264480BE8DD}
+		{7BD9E469-1854-4D21-B7FB-74C98A7D2361} = {42F44289-A9B4-4970-ABAD-D53900F92E56}
+		{2050FA72-2FB5-4057-B33A-7716064BE254} = {42F44289-A9B4-4970-ABAD-D53900F92E56}
+		{7B2FD545-81F8-4604-825A-070AAB9A01CA} = {42F44289-A9B4-4970-ABAD-D53900F92E56}
+		{D0417262-7CF9-4DCB-8738-9294EF18C71A} = {42F44289-A9B4-4970-ABAD-D53900F92E56}
+		{7F7BB520-112B-4C69-B32C-EEE7C64CB449} = {42F44289-A9B4-4970-ABAD-D53900F92E56}
+		{0C54036A-68E7-4D87-AE77-72279D8DC116} = {A5240341-B58B-4B3C-BC2A-51048E1CE0E6}
+		{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE} = {A5240341-B58B-4B3C-BC2A-51048E1CE0E6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8C21EE8-B271-4014-B9D9-B2C31520AF3F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7DB0DF2-9CF2-42FB-89A7-450550B52C48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F475AC54-2107-4CBB-9C91-EE668E770DFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F475AC54-2107-4CBB-9C91-EE668E770DFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F475AC54-2107-4CBB-9C91-EE668E770DFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F475AC54-2107-4CBB-9C91-EE668E770DFB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90C9B7BA-9AA1-49DA-8DB1-5E7CC8A304D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BD9E469-1854-4D21-B7FB-74C98A7D2361}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BD9E469-1854-4D21-B7FB-74C98A7D2361}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BD9E469-1854-4D21-B7FB-74C98A7D2361}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BD9E469-1854-4D21-B7FB-74C98A7D2361}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2050FA72-2FB5-4057-B33A-7716064BE254}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2050FA72-2FB5-4057-B33A-7716064BE254}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2050FA72-2FB5-4057-B33A-7716064BE254}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2050FA72-2FB5-4057-B33A-7716064BE254}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C54036A-68E7-4D87-AE77-72279D8DC116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C54036A-68E7-4D87-AE77-72279D8DC116}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C54036A-68E7-4D87-AE77-72279D8DC116}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C54036A-68E7-4D87-AE77-72279D8DC116}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9180DE2-C834-47A6-B5E9-B95A5EE7FA76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B2FD545-81F8-4604-825A-070AAB9A01CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B2FD545-81F8-4604-825A-070AAB9A01CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B2FD545-81F8-4604-825A-070AAB9A01CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B2FD545-81F8-4604-825A-070AAB9A01CA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECFA0770-73C5-4EEE-A51F-8A2DDFEB04BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0417262-7CF9-4DCB-8738-9294EF18C71A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0417262-7CF9-4DCB-8738-9294EF18C71A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D0417262-7CF9-4DCB-8738-9294EF18C71A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0417262-7CF9-4DCB-8738-9294EF18C71A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F7BB520-112B-4C69-B32C-EEE7C64CB449}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7BB520-112B-4C69-B32C-EEE7C64CB449}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F7BB520-112B-4C69-B32C-EEE7C64CB449}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F7BB520-112B-4C69-B32C-EEE7C64CB449}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{F8C21EE8-B271-4014-B9D9-B2C31520AF3F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C7DB0DF2-9CF2-42FB-89A7-450550B52C48} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{99180E9D-F72D-4EF5-8F0E-79C6B29C3FA2} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F475AC54-2107-4CBB-9C91-EE668E770DFB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {17DAFDBC-B0D5-4B75-B598-686C2D64FB38}
+		SolutionGuid = {EFEE317E-9BE9-4733-A847-E0DBA00099CF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
index 953cc47adcda82..336bbf18a12fce 100644
--- a/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
+++ b/src/libraries/System.Net.WebProxy/System.Net.WebProxy.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy.Tests", "tests\System.Net.WebProxy.Tests.csproj", "{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6C18AD20-E20F-4652-83E3-D24E4670530D} = {6C18AD20-E20F-4652-83E3-D24E4670530D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4F05FFEE-F76C-440A-8A56-CFDCE04DABAE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy", "src\System.Net.WebProxy.csproj", "{6C18AD20-E20F-4652-83E3-D24E4670530D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B7B008FB-2C9F-4111-887C-E3FEC284FE3C} = {B7B008FB-2C9F-4111-887C-E3FEC284FE3C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E04B4081-F66B-464A-95A0-7528175F5F8E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy", "ref\System.Net.WebProxy.csproj", "{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy", "ref\System.Net.WebProxy.csproj", "{D9D40485-7AAE-474C-833A-C21021A823BF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy", "src\System.Net.WebProxy.csproj", "{C841B625-5802-40BE-850C-FA935E3D6E9A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebProxy.Tests", "tests\System.Net.WebProxy.Tests.csproj", "{80A28FFF-68C8-431B-83BE-F04E3155F16A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7C5F423B-BC8E-4E59-A583-8DABB439A1FB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5C611D1A-D8AC-49DB-8F9A-ECB14EAD93B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F5ADFF8C-383D-4528-A04A-1B3957BCCB84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F6E02031-4EF4-4413-B6E9-D87D2D475C95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{CA79C4D6-81F3-41F8-90A6-14965C3AD68C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4E06FCCE-8BF1-446C-A9BA-955A2880BFC2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EEF8E64B-1C5B-48E4-BF7A-82D460D2197B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A594CB37-60CA-4BCC-84FE-A613E0C43037}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{4F05FFEE-F76C-440A-8A56-CFDCE04DABAE} = {4E06FCCE-8BF1-446C-A9BA-955A2880BFC2}
+		{80A28FFF-68C8-431B-83BE-F04E3155F16A} = {4E06FCCE-8BF1-446C-A9BA-955A2880BFC2}
+		{E04B4081-F66B-464A-95A0-7528175F5F8E} = {EEF8E64B-1C5B-48E4-BF7A-82D460D2197B}
+		{D9D40485-7AAE-474C-833A-C21021A823BF} = {EEF8E64B-1C5B-48E4-BF7A-82D460D2197B}
+		{7C5F423B-BC8E-4E59-A583-8DABB439A1FB} = {EEF8E64B-1C5B-48E4-BF7A-82D460D2197B}
+		{F6E02031-4EF4-4413-B6E9-D87D2D475C95} = {EEF8E64B-1C5B-48E4-BF7A-82D460D2197B}
+		{CA79C4D6-81F3-41F8-90A6-14965C3AD68C} = {EEF8E64B-1C5B-48E4-BF7A-82D460D2197B}
+		{C841B625-5802-40BE-850C-FA935E3D6E9A} = {A594CB37-60CA-4BCC-84FE-A613E0C43037}
+		{F5ADFF8C-383D-4528-A04A-1B3957BCCB84} = {A594CB37-60CA-4BCC-84FE-A613E0C43037}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C18AD20-E20F-4652-83E3-D24E4670530D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C18AD20-E20F-4652-83E3-D24E4670530D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C18AD20-E20F-4652-83E3-D24E4670530D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C18AD20-E20F-4652-83E3-D24E4670530D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7B008FB-2C9F-4111-887C-E3FEC284FE3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C611D1A-D8AC-49DB-8F9A-ECB14EAD93B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C611D1A-D8AC-49DB-8F9A-ECB14EAD93B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C611D1A-D8AC-49DB-8F9A-ECB14EAD93B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C611D1A-D8AC-49DB-8F9A-ECB14EAD93B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F05FFEE-F76C-440A-8A56-CFDCE04DABAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F05FFEE-F76C-440A-8A56-CFDCE04DABAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F05FFEE-F76C-440A-8A56-CFDCE04DABAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F05FFEE-F76C-440A-8A56-CFDCE04DABAE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E04B4081-F66B-464A-95A0-7528175F5F8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E04B4081-F66B-464A-95A0-7528175F5F8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E04B4081-F66B-464A-95A0-7528175F5F8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E04B4081-F66B-464A-95A0-7528175F5F8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9D40485-7AAE-474C-833A-C21021A823BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9D40485-7AAE-474C-833A-C21021A823BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9D40485-7AAE-474C-833A-C21021A823BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9D40485-7AAE-474C-833A-C21021A823BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C841B625-5802-40BE-850C-FA935E3D6E9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C841B625-5802-40BE-850C-FA935E3D6E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C841B625-5802-40BE-850C-FA935E3D6E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C841B625-5802-40BE-850C-FA935E3D6E9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80A28FFF-68C8-431B-83BE-F04E3155F16A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7C5F423B-BC8E-4E59-A583-8DABB439A1FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5ADFF8C-383D-4528-A04A-1B3957BCCB84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6E02031-4EF4-4413-B6E9-D87D2D475C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6E02031-4EF4-4413-B6E9-D87D2D475C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6E02031-4EF4-4413-B6E9-D87D2D475C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6E02031-4EF4-4413-B6E9-D87D2D475C95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA79C4D6-81F3-41F8-90A6-14965C3AD68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA79C4D6-81F3-41F8-90A6-14965C3AD68C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA79C4D6-81F3-41F8-90A6-14965C3AD68C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA79C4D6-81F3-41F8-90A6-14965C3AD68C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0DB204CE-1CB8-4CC2-A2E3-43DA93DC898B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6C18AD20-E20F-4652-83E3-D24E4670530D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B7B008FB-2C9F-4111-887C-E3FEC284FE3C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{5C611D1A-D8AC-49DB-8F9A-ECB14EAD93B6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5040A311-873C-4028-AC88-72EB1FCCCB83}
+		SolutionGuid = {91AA499B-9713-4B53-A6A7-7035C7C72935}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
index 3aeb14b47d928b..ed370c11c6080a 100644
--- a/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
+++ b/src/libraries/System.Net.WebSockets.Client/System.Net.WebSockets.Client.sln
@@ -1,60 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client.Tests", "tests\System.Net.WebSockets.Client.Tests.csproj", "{7C395A91-D955-444C-98BF-D3F809A56CE1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B} = {B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B615DEB1-354C-4357-987A-BBA921E5A712}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client", "src\System.Net.WebSockets.Client.csproj", "{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F282B57E-2E1E-422B-8AC2-88145E37B809} = {F282B57E-2E1E-422B-8AC2-88145E37B809}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7046884A-A00C-45B3-A5D2-BC9F568465ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client", "ref\System.Net.WebSockets.Client.csproj", "{F282B57E-2E1E-422B-8AC2-88145E37B809}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client", "ref\System.Net.WebSockets.Client.csproj", "{BEA5BC2C-12D1-4D01-8D2C-5029578BD066}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client", "src\System.Net.WebSockets.Client.csproj", "{0CD4C24D-7746-46F0-8D47-A396882B5468}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Client.Tests", "tests\System.Net.WebSockets.Client.Tests.csproj", "{90E8DA45-66F3-491E-B408-82AB85EEAB76}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "..\System.Private.Runtime.InteropServices.JavaScript\src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7E207B06-C3D0-4F00-A061-7E9C45C9EC13}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{6B9721B2-00D0-41EC-96B9-6428CF1830CF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{59A23CAB-D098-495F-A467-74C7553FF5BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{0EF05CAA-49A3-4CC5-B169-60BB35AC98D5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{997875EB-F2FC-4F79-B161-9823D4D1C18C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4824034D-5A36-4D34-8AD4-AEF40E91F5E2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E431BEDD-FBEF-4A0F-91ED-2F96505E7DA1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E22371DB-C57D-4EAA-9A5B-E71779A7D104}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B615DEB1-354C-4357-987A-BBA921E5A712} = {4824034D-5A36-4D34-8AD4-AEF40E91F5E2}
+		{90E8DA45-66F3-491E-B408-82AB85EEAB76} = {4824034D-5A36-4D34-8AD4-AEF40E91F5E2}
+		{7046884A-A00C-45B3-A5D2-BC9F568465ED} = {E431BEDD-FBEF-4A0F-91ED-2F96505E7DA1}
+		{BEA5BC2C-12D1-4D01-8D2C-5029578BD066} = {E431BEDD-FBEF-4A0F-91ED-2F96505E7DA1}
+		{6B9721B2-00D0-41EC-96B9-6428CF1830CF} = {E431BEDD-FBEF-4A0F-91ED-2F96505E7DA1}
+		{0EF05CAA-49A3-4CC5-B169-60BB35AC98D5} = {E431BEDD-FBEF-4A0F-91ED-2F96505E7DA1}
+		{997875EB-F2FC-4F79-B161-9823D4D1C18C} = {E431BEDD-FBEF-4A0F-91ED-2F96505E7DA1}
+		{0CD4C24D-7746-46F0-8D47-A396882B5468} = {E22371DB-C57D-4EAA-9A5B-E71779A7D104}
+		{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8} = {E22371DB-C57D-4EAA-9A5B-E71779A7D104}
+		{59A23CAB-D098-495F-A467-74C7553FF5BB} = {E22371DB-C57D-4EAA-9A5B-E71779A7D104}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C395A91-D955-444C-98BF-D3F809A56CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C395A91-D955-444C-98BF-D3F809A56CE1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F282B57E-2E1E-422B-8AC2-88145E37B809}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F282B57E-2E1E-422B-8AC2-88145E37B809}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F282B57E-2E1E-422B-8AC2-88145E37B809}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F282B57E-2E1E-422B-8AC2-88145E37B809}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E207B06-C3D0-4F00-A061-7E9C45C9EC13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E207B06-C3D0-4F00-A061-7E9C45C9EC13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E207B06-C3D0-4F00-A061-7E9C45C9EC13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E207B06-C3D0-4F00-A061-7E9C45C9EC13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B615DEB1-354C-4357-987A-BBA921E5A712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B615DEB1-354C-4357-987A-BBA921E5A712}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B615DEB1-354C-4357-987A-BBA921E5A712}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B615DEB1-354C-4357-987A-BBA921E5A712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7046884A-A00C-45B3-A5D2-BC9F568465ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7046884A-A00C-45B3-A5D2-BC9F568465ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7046884A-A00C-45B3-A5D2-BC9F568465ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7046884A-A00C-45B3-A5D2-BC9F568465ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEA5BC2C-12D1-4D01-8D2C-5029578BD066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BEA5BC2C-12D1-4D01-8D2C-5029578BD066}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEA5BC2C-12D1-4D01-8D2C-5029578BD066}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BEA5BC2C-12D1-4D01-8D2C-5029578BD066}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CD4C24D-7746-46F0-8D47-A396882B5468}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CD4C24D-7746-46F0-8D47-A396882B5468}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CD4C24D-7746-46F0-8D47-A396882B5468}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CD4C24D-7746-46F0-8D47-A396882B5468}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90E8DA45-66F3-491E-B408-82AB85EEAB76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90E8DA45-66F3-491E-B408-82AB85EEAB76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90E8DA45-66F3-491E-B408-82AB85EEAB76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90E8DA45-66F3-491E-B408-82AB85EEAB76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CD4D190-F656-4970-9AE9-4A9F8B30A2F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B9721B2-00D0-41EC-96B9-6428CF1830CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59A23CAB-D098-495F-A467-74C7553FF5BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59A23CAB-D098-495F-A467-74C7553FF5BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59A23CAB-D098-495F-A467-74C7553FF5BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59A23CAB-D098-495F-A467-74C7553FF5BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EF05CAA-49A3-4CC5-B169-60BB35AC98D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EF05CAA-49A3-4CC5-B169-60BB35AC98D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EF05CAA-49A3-4CC5-B169-60BB35AC98D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EF05CAA-49A3-4CC5-B169-60BB35AC98D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{997875EB-F2FC-4F79-B161-9823D4D1C18C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{997875EB-F2FC-4F79-B161-9823D4D1C18C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{997875EB-F2FC-4F79-B161-9823D4D1C18C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{997875EB-F2FC-4F79-B161-9823D4D1C18C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7C395A91-D955-444C-98BF-D3F809A56CE1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B8AD98AE-84C3-4313-B3F1-EE8BD5BFF69B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F282B57E-2E1E-422B-8AC2-88145E37B809} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7E207B06-C3D0-4F00-A061-7E9C45C9EC13} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0998F457-1A03-4825-96F4-9B6EFC1F08EF}
+		SolutionGuid = {D91D7DC5-24CC-4716-A357-8170C4EB1C32}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln b/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln
index 7a82f47f3cbaee..0a4115b62628b0 100644
--- a/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln
+++ b/src/libraries/System.Net.WebSockets.WebSocketProtocol/System.Net.WebSockets.WebSocketProtocol.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.WebSocketProtocol.Tests", "tests\System.Net.WebSockets.WebSocketProtocol.Tests.csproj", "{CF73547B-07D2-4290-A14A-CA2A354F4D21}"
-	ProjectSection(ProjectDependencies) = postProject
-		{747BE014-7C1D-4460-95AF-B41C35717165} = {747BE014-7C1D-4460-95AF-B41C35717165}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B6EF5109-6DE6-4CE3-879D-060AA8698540}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.WebSocketProtocol", "src\System.Net.WebSockets.WebSocketProtocol.csproj", "{747BE014-7C1D-4460-95AF-B41C35717165}"
-	ProjectSection(ProjectDependencies) = postProject
-		{203345A4-0E3B-43C1-ADEB-FF493E578063} = {203345A4-0E3B-43C1-ADEB-FF493E578063}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{BFA2FE9A-920B-4A51-B6A7-571FCE6FF542}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.WebSocketProtocol", "ref\System.Net.WebSockets.WebSocketProtocol.csproj", "{203345A4-0E3B-43C1-ADEB-FF493E578063}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.WebSocketProtocol", "ref\System.Net.WebSockets.WebSocketProtocol.csproj", "{753243E4-C9B5-4E5C-8FBA-1211B63C435A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.WebSocketProtocol", "src\System.Net.WebSockets.WebSocketProtocol.csproj", "{F9419A4B-8CBA-4609-BC2A-8596087CD3B0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.WebSocketProtocol.Tests", "tests\System.Net.WebSockets.WebSocketProtocol.Tests.csproj", "{EA24382F-2448-4217-8682-E213A6EF868F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ABE7DC67-F098-409C-B28C-A59CBEE888F3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{49E51E8D-40CE-4215-9D2A-751423B0C782}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D6B4EB67-A972-4252-9F8C-C53FA38730E6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{FE98CB0A-9BF7-4FBF-A792-9F89F532CE43}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{22F639F5-413A-41A2-A66D-E8E6876C007C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{CBA116A5-3B17-4ED8-9F82-E3E1A36E0424}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7825E342-AA06-40BC-89BD-BBC88DD3C2FE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CBD1A8B6-B9E0-4D3D-9DEC-D95B022A8C23}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B6EF5109-6DE6-4CE3-879D-060AA8698540} = {CBA116A5-3B17-4ED8-9F82-E3E1A36E0424}
+		{EA24382F-2448-4217-8682-E213A6EF868F} = {CBA116A5-3B17-4ED8-9F82-E3E1A36E0424}
+		{BFA2FE9A-920B-4A51-B6A7-571FCE6FF542} = {7825E342-AA06-40BC-89BD-BBC88DD3C2FE}
+		{753243E4-C9B5-4E5C-8FBA-1211B63C435A} = {7825E342-AA06-40BC-89BD-BBC88DD3C2FE}
+		{ABE7DC67-F098-409C-B28C-A59CBEE888F3} = {7825E342-AA06-40BC-89BD-BBC88DD3C2FE}
+		{FE98CB0A-9BF7-4FBF-A792-9F89F532CE43} = {7825E342-AA06-40BC-89BD-BBC88DD3C2FE}
+		{22F639F5-413A-41A2-A66D-E8E6876C007C} = {7825E342-AA06-40BC-89BD-BBC88DD3C2FE}
+		{F9419A4B-8CBA-4609-BC2A-8596087CD3B0} = {CBD1A8B6-B9E0-4D3D-9DEC-D95B022A8C23}
+		{D6B4EB67-A972-4252-9F8C-C53FA38730E6} = {CBD1A8B6-B9E0-4D3D-9DEC-D95B022A8C23}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF73547B-07D2-4290-A14A-CA2A354F4D21}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF73547B-07D2-4290-A14A-CA2A354F4D21}.Release|Any CPU.Build.0 = Release|Any CPU
-		{747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{747BE014-7C1D-4460-95AF-B41C35717165}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{747BE014-7C1D-4460-95AF-B41C35717165}.Release|Any CPU.Build.0 = Release|Any CPU
-		{203345A4-0E3B-43C1-ADEB-FF493E578063}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{203345A4-0E3B-43C1-ADEB-FF493E578063}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{203345A4-0E3B-43C1-ADEB-FF493E578063}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{203345A4-0E3B-43C1-ADEB-FF493E578063}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49E51E8D-40CE-4215-9D2A-751423B0C782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49E51E8D-40CE-4215-9D2A-751423B0C782}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49E51E8D-40CE-4215-9D2A-751423B0C782}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49E51E8D-40CE-4215-9D2A-751423B0C782}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6EF5109-6DE6-4CE3-879D-060AA8698540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6EF5109-6DE6-4CE3-879D-060AA8698540}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6EF5109-6DE6-4CE3-879D-060AA8698540}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6EF5109-6DE6-4CE3-879D-060AA8698540}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFA2FE9A-920B-4A51-B6A7-571FCE6FF542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFA2FE9A-920B-4A51-B6A7-571FCE6FF542}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFA2FE9A-920B-4A51-B6A7-571FCE6FF542}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFA2FE9A-920B-4A51-B6A7-571FCE6FF542}.Release|Any CPU.Build.0 = Release|Any CPU
+		{753243E4-C9B5-4E5C-8FBA-1211B63C435A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{753243E4-C9B5-4E5C-8FBA-1211B63C435A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{753243E4-C9B5-4E5C-8FBA-1211B63C435A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{753243E4-C9B5-4E5C-8FBA-1211B63C435A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F9419A4B-8CBA-4609-BC2A-8596087CD3B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F9419A4B-8CBA-4609-BC2A-8596087CD3B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F9419A4B-8CBA-4609-BC2A-8596087CD3B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F9419A4B-8CBA-4609-BC2A-8596087CD3B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA24382F-2448-4217-8682-E213A6EF868F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA24382F-2448-4217-8682-E213A6EF868F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA24382F-2448-4217-8682-E213A6EF868F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA24382F-2448-4217-8682-E213A6EF868F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABE7DC67-F098-409C-B28C-A59CBEE888F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABE7DC67-F098-409C-B28C-A59CBEE888F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABE7DC67-F098-409C-B28C-A59CBEE888F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABE7DC67-F098-409C-B28C-A59CBEE888F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6B4EB67-A972-4252-9F8C-C53FA38730E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6B4EB67-A972-4252-9F8C-C53FA38730E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6B4EB67-A972-4252-9F8C-C53FA38730E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6B4EB67-A972-4252-9F8C-C53FA38730E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE98CB0A-9BF7-4FBF-A792-9F89F532CE43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE98CB0A-9BF7-4FBF-A792-9F89F532CE43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE98CB0A-9BF7-4FBF-A792-9F89F532CE43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE98CB0A-9BF7-4FBF-A792-9F89F532CE43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22F639F5-413A-41A2-A66D-E8E6876C007C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22F639F5-413A-41A2-A66D-E8E6876C007C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22F639F5-413A-41A2-A66D-E8E6876C007C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22F639F5-413A-41A2-A66D-E8E6876C007C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CF73547B-07D2-4290-A14A-CA2A354F4D21} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{747BE014-7C1D-4460-95AF-B41C35717165} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{203345A4-0E3B-43C1-ADEB-FF493E578063} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{49E51E8D-40CE-4215-9D2A-751423B0C782} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4F6D2B92-3839-4CC5-90AE-515946FB09D7}
+		SolutionGuid = {BC6A06B6-892F-402D-80A3-24138262A1A2}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
index 9451e96b9a4eae..e13f478766c41e 100644
--- a/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
+++ b/src/libraries/System.Net.WebSockets/System.Net.WebSockets.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Tests", "tests\System.Net.WebSockets.Tests.csproj", "{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1} = {B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{069D7B60-D002-4FEC-BE53-62C75EBF823B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets", "src\System.Net.WebSockets.csproj", "{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A2F08695-A550-4AA2-806D-E5E7D86D8F25} = {A2F08695-A550-4AA2-806D-E5E7D86D8F25}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D16DE6EE-7A32-4CAC-8343-D3701A561BAF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets", "ref\System.Net.WebSockets.csproj", "{A2F08695-A550-4AA2-806D-E5E7D86D8F25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets", "ref\System.Net.WebSockets.csproj", "{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets", "src\System.Net.WebSockets.csproj", "{D701D3C7-0CCD-4245-97C4-A90F3972DFDC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.WebSockets.Tests", "tests\System.Net.WebSockets.Tests.csproj", "{5886B73F-4547-4C88-AD69-8D29668CB05B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{15277055-A68B-4BA4-8195-8360EF13906D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{73A86BB2-173F-42C6-8546-0A6128965A4A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{FFB1986E-EE56-45B7-8948-07580991D7CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{82846B99-F928-40A3-AA06-C9617A1CC378}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{1FC9CE9B-C1D5-4424-95F7-B28B698EAE4A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BB82EC64-FCCD-4732-AEBA-006EF3E8704D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E6BC8137-73F9-4748-9325-D54B3AE9F8FA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89CCAAD5-B52B-457A-A148-9FC7D672DA30}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{069D7B60-D002-4FEC-BE53-62C75EBF823B} = {BB82EC64-FCCD-4732-AEBA-006EF3E8704D}
+		{5886B73F-4547-4C88-AD69-8D29668CB05B} = {BB82EC64-FCCD-4732-AEBA-006EF3E8704D}
+		{D16DE6EE-7A32-4CAC-8343-D3701A561BAF} = {E6BC8137-73F9-4748-9325-D54B3AE9F8FA}
+		{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD} = {E6BC8137-73F9-4748-9325-D54B3AE9F8FA}
+		{15277055-A68B-4BA4-8195-8360EF13906D} = {E6BC8137-73F9-4748-9325-D54B3AE9F8FA}
+		{82846B99-F928-40A3-AA06-C9617A1CC378} = {E6BC8137-73F9-4748-9325-D54B3AE9F8FA}
+		{1FC9CE9B-C1D5-4424-95F7-B28B698EAE4A} = {E6BC8137-73F9-4748-9325-D54B3AE9F8FA}
+		{D701D3C7-0CCD-4245-97C4-A90F3972DFDC} = {89CCAAD5-B52B-457A-A148-9FC7D672DA30}
+		{FFB1986E-EE56-45B7-8948-07580991D7CC} = {89CCAAD5-B52B-457A-A148-9FC7D672DA30}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0887C5AD-1BE1-4898-94CD-FE2104E04A4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2F08695-A550-4AA2-806D-E5E7D86D8F25}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73A86BB2-173F-42C6-8546-0A6128965A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73A86BB2-173F-42C6-8546-0A6128965A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73A86BB2-173F-42C6-8546-0A6128965A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73A86BB2-173F-42C6-8546-0A6128965A4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{069D7B60-D002-4FEC-BE53-62C75EBF823B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{069D7B60-D002-4FEC-BE53-62C75EBF823B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{069D7B60-D002-4FEC-BE53-62C75EBF823B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{069D7B60-D002-4FEC-BE53-62C75EBF823B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D16DE6EE-7A32-4CAC-8343-D3701A561BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D16DE6EE-7A32-4CAC-8343-D3701A561BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D16DE6EE-7A32-4CAC-8343-D3701A561BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D16DE6EE-7A32-4CAC-8343-D3701A561BAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C3B9B1F-0C70-4ECE-83A7-21FD93E328CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D701D3C7-0CCD-4245-97C4-A90F3972DFDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D701D3C7-0CCD-4245-97C4-A90F3972DFDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D701D3C7-0CCD-4245-97C4-A90F3972DFDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D701D3C7-0CCD-4245-97C4-A90F3972DFDC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5886B73F-4547-4C88-AD69-8D29668CB05B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5886B73F-4547-4C88-AD69-8D29668CB05B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5886B73F-4547-4C88-AD69-8D29668CB05B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5886B73F-4547-4C88-AD69-8D29668CB05B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15277055-A68B-4BA4-8195-8360EF13906D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15277055-A68B-4BA4-8195-8360EF13906D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15277055-A68B-4BA4-8195-8360EF13906D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15277055-A68B-4BA4-8195-8360EF13906D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFB1986E-EE56-45B7-8948-07580991D7CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFB1986E-EE56-45B7-8948-07580991D7CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFB1986E-EE56-45B7-8948-07580991D7CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFB1986E-EE56-45B7-8948-07580991D7CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82846B99-F928-40A3-AA06-C9617A1CC378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82846B99-F928-40A3-AA06-C9617A1CC378}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82846B99-F928-40A3-AA06-C9617A1CC378}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82846B99-F928-40A3-AA06-C9617A1CC378}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FC9CE9B-C1D5-4424-95F7-B28B698EAE4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FC9CE9B-C1D5-4424-95F7-B28B698EAE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FC9CE9B-C1D5-4424-95F7-B28B698EAE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FC9CE9B-C1D5-4424-95F7-B28B698EAE4A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0887C5AD-1BE1-4898-94CD-FE2104E04A4A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B0C83201-EC32-4E8D-9DE4-EEF41E052DA1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{A2F08695-A550-4AA2-806D-E5E7D86D8F25} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{73A86BB2-173F-42C6-8546-0A6128965A4A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {07264E78-33B3-44EB-A0C4-74722F839494}
+		SolutionGuid = {78E8A71E-2CB4-4C05-8DBB-C926F44A9393}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
index 8ca1b49eb5f07e..22ef1928771a32 100644
--- a/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
+++ b/src/libraries/System.Numerics.Tensors/System.Numerics.Tensors.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors.Tests", "tests\System.Numerics.Tensors.Tests.csproj", "{D4718CD3-8492-4734-94B7-E31A39AA6275}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BE0F13BE-9140-49A8-9FDD-994D0D8A3805} = {BE0F13BE-9140-49A8-9FDD-994D0D8A3805}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9F20CEA1-2216-4432-BBBD-F01E05D17F23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "src\System.Numerics.Tensors.csproj", "{BE0F13BE-9140-49A8-9FDD-994D0D8A3805}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F64208FC-83DA-4C94-973F-1DDDE4354AFF} = {F64208FC-83DA-4C94-973F-1DDDE4354AFF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{28AF88E2-78C7-452C-94B1-88CF7ABF2659}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "ref\System.Numerics.Tensors.csproj", "{F64208FC-83DA-4C94-973F-1DDDE4354AFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "ref\System.Numerics.Tensors.csproj", "{21CB448A-3882-4337-B416-D1A3E0BCFFC5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors", "src\System.Numerics.Tensors.csproj", "{848DD000-3D22-4A25-A9D9-05AFF857A116}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Tensors.Tests", "tests\System.Numerics.Tensors.Tests.csproj", "{4AF6A02D-82C8-4898-9EDF-01F107C25061}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{76BF756D-3975-4A7B-A0A6-43A73C4EBAF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B95060C1-814D-464A-84AE-20BF996BA413}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8322B024-AD5D-454C-8BD3-745161270B82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E3CFD6D4-3EA5-459F-B2D7-6C4D1699BB8F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B9C46415-E355-42EE-897A-D555CEF46584}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{315EA734-1279-42CD-A704-59BB1F6AB1AC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F1596B06-5B29-4B28-9007-C513358ACDEA}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{9F20CEA1-2216-4432-BBBD-F01E05D17F23} = {B9C46415-E355-42EE-897A-D555CEF46584}
+		{4AF6A02D-82C8-4898-9EDF-01F107C25061} = {B9C46415-E355-42EE-897A-D555CEF46584}
+		{28AF88E2-78C7-452C-94B1-88CF7ABF2659} = {315EA734-1279-42CD-A704-59BB1F6AB1AC}
+		{21CB448A-3882-4337-B416-D1A3E0BCFFC5} = {315EA734-1279-42CD-A704-59BB1F6AB1AC}
+		{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C} = {315EA734-1279-42CD-A704-59BB1F6AB1AC}
+		{8322B024-AD5D-454C-8BD3-745161270B82} = {315EA734-1279-42CD-A704-59BB1F6AB1AC}
+		{E3CFD6D4-3EA5-459F-B2D7-6C4D1699BB8F} = {315EA734-1279-42CD-A704-59BB1F6AB1AC}
+		{848DD000-3D22-4A25-A9D9-05AFF857A116} = {F1596B06-5B29-4B28-9007-C513358ACDEA}
+		{B95060C1-814D-464A-84AE-20BF996BA413} = {F1596B06-5B29-4B28-9007-C513358ACDEA}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D4718CD3-8492-4734-94B7-E31A39AA6275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D4718CD3-8492-4734-94B7-E31A39AA6275}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D4718CD3-8492-4734-94B7-E31A39AA6275}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D4718CD3-8492-4734-94B7-E31A39AA6275}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE0F13BE-9140-49A8-9FDD-994D0D8A3805}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F64208FC-83DA-4C94-973F-1DDDE4354AFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F64208FC-83DA-4C94-973F-1DDDE4354AFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F64208FC-83DA-4C94-973F-1DDDE4354AFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F64208FC-83DA-4C94-973F-1DDDE4354AFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76BF756D-3975-4A7B-A0A6-43A73C4EBAF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76BF756D-3975-4A7B-A0A6-43A73C4EBAF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76BF756D-3975-4A7B-A0A6-43A73C4EBAF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76BF756D-3975-4A7B-A0A6-43A73C4EBAF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F20CEA1-2216-4432-BBBD-F01E05D17F23}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28AF88E2-78C7-452C-94B1-88CF7ABF2659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28AF88E2-78C7-452C-94B1-88CF7ABF2659}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28AF88E2-78C7-452C-94B1-88CF7ABF2659}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28AF88E2-78C7-452C-94B1-88CF7ABF2659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21CB448A-3882-4337-B416-D1A3E0BCFFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21CB448A-3882-4337-B416-D1A3E0BCFFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21CB448A-3882-4337-B416-D1A3E0BCFFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21CB448A-3882-4337-B416-D1A3E0BCFFC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{848DD000-3D22-4A25-A9D9-05AFF857A116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{848DD000-3D22-4A25-A9D9-05AFF857A116}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{848DD000-3D22-4A25-A9D9-05AFF857A116}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{848DD000-3D22-4A25-A9D9-05AFF857A116}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AF6A02D-82C8-4898-9EDF-01F107C25061}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB5F9E86-6849-463D-B7B6-9BAF0A73BE6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B95060C1-814D-464A-84AE-20BF996BA413}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B95060C1-814D-464A-84AE-20BF996BA413}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B95060C1-814D-464A-84AE-20BF996BA413}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B95060C1-814D-464A-84AE-20BF996BA413}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8322B024-AD5D-454C-8BD3-745161270B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8322B024-AD5D-454C-8BD3-745161270B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8322B024-AD5D-454C-8BD3-745161270B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8322B024-AD5D-454C-8BD3-745161270B82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3CFD6D4-3EA5-459F-B2D7-6C4D1699BB8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3CFD6D4-3EA5-459F-B2D7-6C4D1699BB8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3CFD6D4-3EA5-459F-B2D7-6C4D1699BB8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3CFD6D4-3EA5-459F-B2D7-6C4D1699BB8F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D4718CD3-8492-4734-94B7-E31A39AA6275} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BE0F13BE-9140-49A8-9FDD-994D0D8A3805} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F64208FC-83DA-4C94-973F-1DDDE4354AFF} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{76BF756D-3975-4A7B-A0A6-43A73C4EBAF7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {13D12508-D252-4FD4-A8AA-1DD44F666914}
+		SolutionGuid = {10A5F2C3-5230-4916-9D4D-BBDB94851037}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
index 3b4bf8bc133e5b..850c9665498d8c 100644
--- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
+++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors.Tests", "tests\System.Numerics.Vectors.Tests.csproj", "{99E1E564-0EF4-4E33-BECE-8ABE64771349}"
-	ProjectSection(ProjectDependencies) = postProject
-		{53134B0C-0D57-481B-B84E-D1991E8D54FF} = {53134B0C-0D57-481B-B84E-D1991E8D54FF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{634A3B2B-09F5-4810-B630-ADE4D36C47DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors", "src\System.Numerics.Vectors.csproj", "{53134B0C-0D57-481B-B84E-D1991E8D54FF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{650277B5-9423-4ACE-BB54-2659995B21C7} = {650277B5-9423-4ACE-BB54-2659995B21C7}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors", "ref\System.Numerics.Vectors.csproj", "{650277B5-9423-4ACE-BB54-2659995B21C7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors", "ref\System.Numerics.Vectors.csproj", "{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors", "src\System.Numerics.Vectors.csproj", "{ED450846-85A0-4CED-B4D9-9EB769CF794B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors.Tests", "tests\System.Numerics.Vectors.Tests.csproj", "{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F76DBC64-9523-462D-ACA0-8E9452155D7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D47BF410-2A81-48E2-A7E5-CE29794B572C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{453F2E85-9FFF-4833-BB86-1B8E73191756}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7A13467C-8469-4562-B00F-C4D61E8A1855}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF} = {D47BF410-2A81-48E2-A7E5-CE29794B572C}
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B} = {D47BF410-2A81-48E2-A7E5-CE29794B572C}
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598} = {D47BF410-2A81-48E2-A7E5-CE29794B572C}
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F} = {453F2E85-9FFF-4833-BB86-1B8E73191756}
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B} = {453F2E85-9FFF-4833-BB86-1B8E73191756}
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A} = {7A13467C-8469-4562-B00F-C4D61E8A1855}
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7} = {7A13467C-8469-4562-B00F-C4D61E8A1855}
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237} = {7A13467C-8469-4562-B00F-C4D61E8A1855}
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F} = {7A13467C-8469-4562-B00F-C4D61E8A1855}
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518} = {7A13467C-8469-4562-B00F-C4D61E8A1855}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99E1E564-0EF4-4E33-BECE-8ABE64771349}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99E1E564-0EF4-4E33-BECE-8ABE64771349}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53134B0C-0D57-481B-B84E-D1991E8D54FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53134B0C-0D57-481B-B84E-D1991E8D54FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{650277B5-9423-4ACE-BB54-2659995B21C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{650277B5-9423-4ACE-BB54-2659995B21C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F76DBC64-9523-462D-ACA0-8E9452155D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F76DBC64-9523-462D-ACA0-8E9452155D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F76DBC64-9523-462D-ACA0-8E9452155D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F76DBC64-9523-462D-ACA0-8E9452155D7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Debug|Any CPU.Build.0 = Debug|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Debug|x64.ActiveCfg = Debug|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Debug|x64.Build.0 = Debug|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Debug|x86.ActiveCfg = Debug|x86
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Debug|x86.Build.0 = Debug|x86
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Release|Any CPU.ActiveCfg = Release|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Release|Any CPU.Build.0 = Release|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Release|x64.ActiveCfg = Release|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Release|x64.Build.0 = Release|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Release|x86.ActiveCfg = Release|x86
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Release|x86.Build.0 = Release|x86
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Checked|Any CPU.Build.0 = Checked|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Checked|x64.ActiveCfg = Checked|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Checked|x64.Build.0 = Checked|x64
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Checked|x86.ActiveCfg = Checked|x86
+		{634A3B2B-09F5-4810-B630-ADE4D36C47DF}.Checked|x86.Build.0 = Checked|x86
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Release|x64.Build.0 = Release|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Release|x86.Build.0 = Release|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9EDBE037-EFE0-4B72-B602-E4C3F0C05F2F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Debug|x64.Build.0 = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Debug|x86.Build.0 = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Release|x64.ActiveCfg = Release|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Release|x64.Build.0 = Release|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Release|x86.Build.0 = Release|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9805AA59-A72D-4D20-BBCE-EBD90DC7840A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Release|x64.Build.0 = Release|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Release|x86.Build.0 = Release|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5B2027FA-F43A-4E80-880F-B3A7A2720AA7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Debug|x64.Build.0 = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Debug|x86.Build.0 = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Release|x64.ActiveCfg = Release|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Release|x64.Build.0 = Release|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Release|x86.ActiveCfg = Release|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Release|x86.Build.0 = Release|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ED450846-85A0-4CED-B4D9-9EB769CF794B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Debug|x64.Build.0 = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Debug|x86.Build.0 = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Release|x64.ActiveCfg = Release|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Release|x64.Build.0 = Release|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Release|x86.ActiveCfg = Release|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Release|x86.Build.0 = Release|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B38797B1-BB45-4B30-9D4F-79D9F4B3735B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|x64.Build.0 = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Debug|x86.Build.0 = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x64.ActiveCfg = Release|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x64.Build.0 = Release|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x86.ActiveCfg = Release|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Release|x86.Build.0 = Release|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DFC21F4E-EC4F-4310-A4DA-B7094AA4D237}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|x64.Build.0 = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Debug|x86.Build.0 = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|x64.ActiveCfg = Release|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|x64.Build.0 = Release|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|x86.ActiveCfg = Release|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Release|x86.Build.0 = Release|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7FAD5E59-D362-4ED6-B3D5-FAD9CD5A2598}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Debug|x64.Build.0 = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Debug|x86.Build.0 = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Release|x64.ActiveCfg = Release|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Release|x64.Build.0 = Release|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Release|x86.ActiveCfg = Release|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Release|x86.Build.0 = Release|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{875DAA4F-1BC0-4EE2-9A04-EDD2FC5C773F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Release|x64.Build.0 = Release|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Release|x86.Build.0 = Release|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BD5C16FE-CAAA-45CB-91F3-C66A2493C518}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{99E1E564-0EF4-4E33-BECE-8ABE64771349} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{53134B0C-0D57-481B-B84E-D1991E8D54FF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{650277B5-9423-4ACE-BB54-2659995B21C7} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F76DBC64-9523-462D-ACA0-8E9452155D7C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F2CB0F70-E844-44DE-9DD8-3A2B72365B73}
+		SolutionGuid = {F9EDC1DC-52BE-4C40-90D2-41EE6FB7FA5C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ObjectModel/System.ObjectModel.sln b/src/libraries/System.ObjectModel/System.ObjectModel.sln
index a1680a0a5ace1e..17ba7ec9815271 100644
--- a/src/libraries/System.ObjectModel/System.ObjectModel.sln
+++ b/src/libraries/System.ObjectModel/System.ObjectModel.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel.Tests", "tests\System.ObjectModel.Tests.csproj", "{43841228-2A2B-4215-B97F-33006995E486}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F24D3391-2928-4E83-AADE-A4461E5CAE50} = {F24D3391-2928-4E83-AADE-A4461E5CAE50}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "src\System.ObjectModel.csproj", "{F24D3391-2928-4E83-AADE-A4461E5CAE50}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72CD7613-337A-41C1-BE90-391973C25201} = {72CD7613-337A-41C1-BE90-391973C25201}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{56FEBF5C-674B-4A94-9D90-41F0D2A1194A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "ref\System.ObjectModel.csproj", "{72CD7613-337A-41C1-BE90-391973C25201}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "ref\System.ObjectModel.csproj", "{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel", "src\System.ObjectModel.csproj", "{583024EB-8FC7-45E3-9C37-85BE43FBD28A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ObjectModel.Tests", "tests\System.ObjectModel.Tests.csproj", "{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{AC5BDF0E-CD13-4179-A8FE-84DC188F0FC4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{35855258-C164-48D6-B7FE-DC585C39999C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2084D0AE-A603-47F7-8A4F-F7E749C0D372}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B11FCEEA-14D3-4B43-9801-51EF0C4D8EB9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3DFC0A93-5140-4A1D-83A3-E91DF87AE03C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{1D2CFB21-25C1-45FF-8ADA-2AAE6C857CE4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C34C040D-16BA-4413-AEFF-341C522127E2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B} = {3DFC0A93-5140-4A1D-83A3-E91DF87AE03C}
+		{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C} = {3DFC0A93-5140-4A1D-83A3-E91DF87AE03C}
+		{56FEBF5C-674B-4A94-9D90-41F0D2A1194A} = {1D2CFB21-25C1-45FF-8ADA-2AAE6C857CE4}
+		{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC} = {1D2CFB21-25C1-45FF-8ADA-2AAE6C857CE4}
+		{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D} = {1D2CFB21-25C1-45FF-8ADA-2AAE6C857CE4}
+		{2084D0AE-A603-47F7-8A4F-F7E749C0D372} = {1D2CFB21-25C1-45FF-8ADA-2AAE6C857CE4}
+		{B11FCEEA-14D3-4B43-9801-51EF0C4D8EB9} = {1D2CFB21-25C1-45FF-8ADA-2AAE6C857CE4}
+		{583024EB-8FC7-45E3-9C37-85BE43FBD28A} = {C34C040D-16BA-4413-AEFF-341C522127E2}
+		{35855258-C164-48D6-B7FE-DC585C39999C} = {C34C040D-16BA-4413-AEFF-341C522127E2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{43841228-2A2B-4215-B97F-33006995E486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43841228-2A2B-4215-B97F-33006995E486}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43841228-2A2B-4215-B97F-33006995E486}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43841228-2A2B-4215-B97F-33006995E486}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F24D3391-2928-4E83-AADE-A4461E5CAE50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F24D3391-2928-4E83-AADE-A4461E5CAE50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F24D3391-2928-4E83-AADE-A4461E5CAE50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F24D3391-2928-4E83-AADE-A4461E5CAE50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72CD7613-337A-41C1-BE90-391973C25201}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72CD7613-337A-41C1-BE90-391973C25201}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72CD7613-337A-41C1-BE90-391973C25201}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72CD7613-337A-41C1-BE90-391973C25201}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC5BDF0E-CD13-4179-A8FE-84DC188F0FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC5BDF0E-CD13-4179-A8FE-84DC188F0FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC5BDF0E-CD13-4179-A8FE-84DC188F0FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC5BDF0E-CD13-4179-A8FE-84DC188F0FC4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D225A590-69FD-4C99-B9D0-2DEF5AEA6C2B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56FEBF5C-674B-4A94-9D90-41F0D2A1194A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56FEBF5C-674B-4A94-9D90-41F0D2A1194A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56FEBF5C-674B-4A94-9D90-41F0D2A1194A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56FEBF5C-674B-4A94-9D90-41F0D2A1194A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E13B9A3B-BA99-4FA3-9959-B95E14DCB9BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{583024EB-8FC7-45E3-9C37-85BE43FBD28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{583024EB-8FC7-45E3-9C37-85BE43FBD28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{583024EB-8FC7-45E3-9C37-85BE43FBD28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{583024EB-8FC7-45E3-9C37-85BE43FBD28A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DB5C0B8-959E-4B0A-99A6-88452FD3C10C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3517194-C2D7-4B7F-87D2-BEA0DBD00A4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35855258-C164-48D6-B7FE-DC585C39999C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35855258-C164-48D6-B7FE-DC585C39999C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35855258-C164-48D6-B7FE-DC585C39999C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35855258-C164-48D6-B7FE-DC585C39999C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2084D0AE-A603-47F7-8A4F-F7E749C0D372}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2084D0AE-A603-47F7-8A4F-F7E749C0D372}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2084D0AE-A603-47F7-8A4F-F7E749C0D372}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2084D0AE-A603-47F7-8A4F-F7E749C0D372}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B11FCEEA-14D3-4B43-9801-51EF0C4D8EB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B11FCEEA-14D3-4B43-9801-51EF0C4D8EB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B11FCEEA-14D3-4B43-9801-51EF0C4D8EB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B11FCEEA-14D3-4B43-9801-51EF0C4D8EB9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{43841228-2A2B-4215-B97F-33006995E486} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F24D3391-2928-4E83-AADE-A4461E5CAE50} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{72CD7613-337A-41C1-BE90-391973C25201} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{AC5BDF0E-CD13-4179-A8FE-84DC188F0FC4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9FC2F4B8-40FE-4938-9AEE-5D4DDC4E6456}
+		SolutionGuid = {485C729C-EB7F-4DE2-AE84-428EB1D65902}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln b/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
index 62aa528b630f25..5011baf87e3ae3 100644
--- a/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
+++ b/src/libraries/System.Private.DataContractSerialization/System.Private.DataContractSerialization.sln
@@ -1,29 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "src\System.Private.DataContractSerialization.csproj", "{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "src\System.Private.DataContractSerialization.csproj", "{493BBB98-5E20-46BE-A7DC-1584F39DE27D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0B1B03BE-655C-40D8-9A2C-569BC669E8C0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{493BBB98-5E20-46BE-A7DC-1584F39DE27D} = {0B1B03BE-655C-40D8-9A2C-569BC669E8C0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{493BBB98-5E20-46BE-A7DC-1584F39DE27D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{493BBB98-5E20-46BE-A7DC-1584F39DE27D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{493BBB98-5E20-46BE-A7DC-1584F39DE27D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{493BBB98-5E20-46BE-A7DC-1584F39DE27D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6B4C1660-D158-4820-BE1C-D7A29CEBEC9B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5CFD48C9-7683-4E2D-9243-54E3362548B8}
+		SolutionGuid = {9D091569-CE23-4382-B8FC-D651959BAB25}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln
index eacf0032df3a19..74b39fdd3763ee 100644
--- a/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln
+++ b/src/libraries/System.Private.Runtime.InteropServices.JavaScript/System.Private.Runtime.InteropServices.JavaScript.sln
@@ -1,61 +1,79 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ABCD5AB6-389B-466D-96E6-B41A671B7454}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1DEC417F-7040-470C-9C62-338CD4BB5FE2}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "System.Private.Runtime.InteropServices.JavaScript.Tests", "tests\System.Private.Runtime.InteropServices.JavaScript.Tests.csproj", "{4F753464-0719-4559-9E0F-86175CECA903}"
-	ProjectSection(ProjectDependencies) = postProject
-		{644FCC7F-1478-4D30-BF66-40E0ADF8723C} = {644FCC7F-1478-4D30-BF66-40E0ADF8723C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript", "src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Private.Runtime.InteropServices.JavaScript", "src\System.Private.Runtime.InteropServices.JavaScript.csproj", "{644FCC7F-1478-4D30-BF66-40E0ADF8723C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Runtime.InteropServices.JavaScript.Tests", "tests\System.Private.Runtime.InteropServices.JavaScript.Tests.csproj", "{4A88DCA2-2A9F-4497-AE84-C15B81F21782}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{9B76030A-9DBD-401E-90B7-18111831B0D9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F1642F23-C510-423E-8598-4B3A09DA28DB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{78A01545-D36A-4A73-A262-5F95855D05AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{C29B30DE-C663-42CB-8AC5-81864613513A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{218A58FB-25F6-48C9-80D0-C170A3FB82FF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2481E1BC-8500-43A6-97D4-B4F1BDC5036B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B32D533A-E1EC-4A72-AB39-7F11E27091B4}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{ABCD5AB6-389B-466D-96E6-B41A671B7454} = {218A58FB-25F6-48C9-80D0-C170A3FB82FF}
+		{4A88DCA2-2A9F-4497-AE84-C15B81F21782} = {218A58FB-25F6-48C9-80D0-C170A3FB82FF}
+		{1DEC417F-7040-470C-9C62-338CD4BB5FE2} = {2481E1BC-8500-43A6-97D4-B4F1BDC5036B}
+		{9B76030A-9DBD-401E-90B7-18111831B0D9} = {2481E1BC-8500-43A6-97D4-B4F1BDC5036B}
+		{78A01545-D36A-4A73-A262-5F95855D05AE} = {2481E1BC-8500-43A6-97D4-B4F1BDC5036B}
+		{C29B30DE-C663-42CB-8AC5-81864613513A} = {2481E1BC-8500-43A6-97D4-B4F1BDC5036B}
+		{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0} = {B32D533A-E1EC-4A72-AB39-7F11E27091B4}
+		{F1642F23-C510-423E-8598-4B3A09DA28DB} = {B32D533A-E1EC-4A72-AB39-7F11E27091B4}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F753464-0719-4559-9E0F-86175CECA903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F753464-0719-4559-9E0F-86175CECA903}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F753464-0719-4559-9E0F-86175CECA903}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F753464-0719-4559-9E0F-86175CECA903}.Release|Any CPU.Build.0 = Release|Any CPU
-		{644FCC7F-1478-4D30-BF66-40E0ADF8723C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{644FCC7F-1478-4D30-BF66-40E0ADF8723C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{644FCC7F-1478-4D30-BF66-40E0ADF8723C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{644FCC7F-1478-4D30-BF66-40E0ADF8723C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABCD5AB6-389B-466D-96E6-B41A671B7454}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABCD5AB6-389B-466D-96E6-B41A671B7454}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABCD5AB6-389B-466D-96E6-B41A671B7454}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABCD5AB6-389B-466D-96E6-B41A671B7454}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1DEC417F-7040-470C-9C62-338CD4BB5FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1DEC417F-7040-470C-9C62-338CD4BB5FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1DEC417F-7040-470C-9C62-338CD4BB5FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1DEC417F-7040-470C-9C62-338CD4BB5FE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EF4B421-0137-4C27-A6D2-DFC2B09E52F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A88DCA2-2A9F-4497-AE84-C15B81F21782}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B76030A-9DBD-401E-90B7-18111831B0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B76030A-9DBD-401E-90B7-18111831B0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B76030A-9DBD-401E-90B7-18111831B0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B76030A-9DBD-401E-90B7-18111831B0D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1642F23-C510-423E-8598-4B3A09DA28DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1642F23-C510-423E-8598-4B3A09DA28DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1642F23-C510-423E-8598-4B3A09DA28DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1642F23-C510-423E-8598-4B3A09DA28DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78A01545-D36A-4A73-A262-5F95855D05AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78A01545-D36A-4A73-A262-5F95855D05AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78A01545-D36A-4A73-A262-5F95855D05AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78A01545-D36A-4A73-A262-5F95855D05AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C29B30DE-C663-42CB-8AC5-81864613513A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C29B30DE-C663-42CB-8AC5-81864613513A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C29B30DE-C663-42CB-8AC5-81864613513A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C29B30DE-C663-42CB-8AC5-81864613513A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{96AF3242-A368-4F13-B006-A722CC3B8517} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4F753464-0719-4559-9E0F-86175CECA903} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{644FCC7F-1478-4D30-BF66-40E0ADF8723C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2151451C-8B2A-44DB-881E-B922A4795A30}
+		SolutionGuid = {339DAF44-AC08-4D3B-BB34-6DA417E800E7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Private.Uri/System.Private.Uri.sln b/src/libraries/System.Private.Uri/System.Private.Uri.sln
index 3af73ec647fbe1..65923b8c668845 100644
--- a/src/libraries/System.Private.Uri/System.Private.Uri.sln
+++ b/src/libraries/System.Private.Uri/System.Private.Uri.sln
@@ -1,75 +1,231 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.ExtendedFunctional.Tests", "tests\ExtendedFunctionalTests\System.Private.Uri.ExtendedFunctional.Tests.csproj", "{7A93B8A0-E663-4CB1-B6A5-850E5EC56146}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {4AC5343E-6E31-4BA5-A795-0493AE7E9008}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.Functional.Tests", "tests\FunctionalTests\System.Private.Uri.Functional.Tests.csproj", "{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {4AC5343E-6E31-4BA5-A795-0493AE7E9008}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ADD88187-83E2-4EAF-BFB4-BC6249E76457}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.Unit.Tests", "tests\UnitTests\System.Private.Uri.Unit.Tests.csproj", "{96AF3242-A368-4F13-B006-A722CC3B8517}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {4AC5343E-6E31-4BA5-A795-0493AE7E9008}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "src\System.Private.Uri.csproj", "{4AC5343E-6E31-4BA5-A795-0493AE7E9008}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "src\System.Private.Uri.csproj", "{98AC821B-892E-4F58-AF3D-503747FD6A8F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.ExtendedFunctional.Tests", "tests\ExtendedFunctionalTests\System.Private.Uri.ExtendedFunctional.Tests.csproj", "{37859855-7E5C-4772-B5D2-7029211EAB92}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.Functional.Tests", "tests\FunctionalTests\System.Private.Uri.Functional.Tests.csproj", "{BDD0866A-D856-40EE-A9D5-1DAC11095E42}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri.Unit.Tests", "tests\UnitTests\System.Private.Uri.Unit.Tests.csproj", "{650441DF-021A-45C3-9560-F9FDB3037A64}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{375E5A4A-9026-411E-9CD8-606874CFF7F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F6024229-9D81-4C97-9655-398A1414A6DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{01EDF06D-BBBB-42D7-9414-A332292235D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{DF930761-5E7C-4853-BC50-1718D8CA332B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{49F66400-EFDB-4F6C-A517-E3C91B199567}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A0DB3B3D-8027-4639-8F47-83FDE0DB7BFA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{59C5B1B2-F1AD-4DE5-A69A-E24C7C4C2374}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EB49EC6F-A043-47D2-B5EA-64E70D2F1085}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE} = {A0DB3B3D-8027-4639-8F47-83FDE0DB7BFA}
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F} = {A0DB3B3D-8027-4639-8F47-83FDE0DB7BFA}
+		{01EDF06D-BBBB-42D7-9414-A332292235D3} = {A0DB3B3D-8027-4639-8F47-83FDE0DB7BFA}
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457} = {59C5B1B2-F1AD-4DE5-A69A-E24C7C4C2374}
+		{37859855-7E5C-4772-B5D2-7029211EAB92} = {59C5B1B2-F1AD-4DE5-A69A-E24C7C4C2374}
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42} = {59C5B1B2-F1AD-4DE5-A69A-E24C7C4C2374}
+		{650441DF-021A-45C3-9560-F9FDB3037A64} = {59C5B1B2-F1AD-4DE5-A69A-E24C7C4C2374}
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0} = {EB49EC6F-A043-47D2-B5EA-64E70D2F1085}
+		{F6024229-9D81-4C97-9655-398A1414A6DC} = {EB49EC6F-A043-47D2-B5EA-64E70D2F1085}
+		{DF930761-5E7C-4853-BC50-1718D8CA332B} = {EB49EC6F-A043-47D2-B5EA-64E70D2F1085}
+		{49F66400-EFDB-4F6C-A517-E3C91B199567} = {EB49EC6F-A043-47D2-B5EA-64E70D2F1085}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7A93B8A0-E663-4CB1-B6A5-850E5EC56146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A93B8A0-E663-4CB1-B6A5-850E5EC56146}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A93B8A0-E663-4CB1-B6A5-850E5EC56146}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A93B8A0-E663-4CB1-B6A5-850E5EC56146}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96AF3242-A368-4F13-B006-A722CC3B8517}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Debug|Any CPU.Build.0 = Debug|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Debug|x64.ActiveCfg = Debug|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Debug|x64.Build.0 = Debug|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Debug|x86.ActiveCfg = Debug|x86
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Debug|x86.Build.0 = Debug|x86
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Release|Any CPU.ActiveCfg = Release|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Release|Any CPU.Build.0 = Release|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Release|x64.ActiveCfg = Release|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Release|x64.Build.0 = Release|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Release|x86.ActiveCfg = Release|x86
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Release|x86.Build.0 = Release|x86
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Checked|Any CPU.Build.0 = Checked|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Checked|x64.ActiveCfg = Checked|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Checked|x64.Build.0 = Checked|x64
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Checked|x86.ActiveCfg = Checked|x86
+		{C150B694-015F-48BD-8CB0-EFF1F7A84DCE}.Checked|x86.Build.0 = Checked|x86
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Debug|x64.Build.0 = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Debug|x86.Build.0 = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Release|x64.ActiveCfg = Release|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Release|x64.Build.0 = Release|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Release|x86.ActiveCfg = Release|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Release|x86.Build.0 = Release|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ADD88187-83E2-4EAF-BFB4-BC6249E76457}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Debug|x64.Build.0 = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Debug|x86.Build.0 = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Release|x64.ActiveCfg = Release|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Release|x64.Build.0 = Release|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Release|x86.ActiveCfg = Release|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Release|x86.Build.0 = Release|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{66FDD25A-E319-4F85-9DD5-C228CDAA90A0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Debug|x64.Build.0 = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Debug|x86.Build.0 = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Release|x64.ActiveCfg = Release|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Release|x64.Build.0 = Release|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Release|x86.ActiveCfg = Release|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Release|x86.Build.0 = Release|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{98AC821B-892E-4F58-AF3D-503747FD6A8F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Debug|x64.Build.0 = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Debug|x86.Build.0 = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Release|x64.ActiveCfg = Release|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Release|x64.Build.0 = Release|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Release|x86.ActiveCfg = Release|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Release|x86.Build.0 = Release|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{37859855-7E5C-4772-B5D2-7029211EAB92}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Debug|x64.Build.0 = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Debug|x86.Build.0 = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Release|x64.ActiveCfg = Release|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Release|x64.Build.0 = Release|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Release|x86.ActiveCfg = Release|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Release|x86.Build.0 = Release|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BDD0866A-D856-40EE-A9D5-1DAC11095E42}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Debug|x64.Build.0 = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Debug|x86.Build.0 = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Release|x64.ActiveCfg = Release|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Release|x64.Build.0 = Release|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Release|x86.ActiveCfg = Release|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Release|x86.Build.0 = Release|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{650441DF-021A-45C3-9560-F9FDB3037A64}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x64.Build.0 = Release|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Release|x86.Build.0 = Release|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F6024229-9D81-4C97-9655-398A1414A6DC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x64.Build.0 = Release|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Release|x86.Build.0 = Release|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{01EDF06D-BBBB-42D7-9414-A332292235D3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Debug|x64.Build.0 = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Debug|x86.Build.0 = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Release|x64.ActiveCfg = Release|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Release|x64.Build.0 = Release|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Release|x86.ActiveCfg = Release|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Release|x86.Build.0 = Release|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DF930761-5E7C-4853-BC50-1718D8CA332B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Debug|x64.Build.0 = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Debug|x86.Build.0 = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Release|x64.ActiveCfg = Release|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Release|x64.Build.0 = Release|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Release|x86.ActiveCfg = Release|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Release|x86.Build.0 = Release|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{49F66400-EFDB-4F6C-A517-E3C91B199567}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7A93B8A0-E663-4CB1-B6A5-850E5EC56146} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{96AF3242-A368-4F13-B006-A722CC3B8517} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4AC5343E-6E31-4BA5-A795-0493AE7E9008} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{CEFAB3B8-3B7F-4B6C-9A5F-2DCDD1A551B5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{375E5A4A-9026-411E-9CD8-606874CFF7F0} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2151451C-8B2A-44DB-881E-B922A4795A30}
+		SolutionGuid = {EB54DAE5-7032-48C6-8714-21ED3B5B2D1E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln b/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
index 80677c76730434..3b0d8338433b97 100644
--- a/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
+++ b/src/libraries/System.Private.Xml.Linq/System.Private.Xml.Linq.sln
@@ -1,175 +1,191 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Axes.Tests", "tests\axes\System.Xml.Linq.Axes.Tests.csproj", "{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Events.Tests", "tests\events\System.Xml.Linq.Events.Tests.csproj", "{C560E194-5B14-4112-ABC6-3208491E53E6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Misc.Tests", "tests\misc\System.Xml.Linq.Misc.Tests.csproj", "{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Properties.Tests", "tests\Properties\System.Xml.Linq.Properties.Tests.csproj", "{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Schema.Extensions.Tests", "tests\Schema\System.Xml.Schema.Extensions.Tests.csproj", "{AFB408EA-2EF7-42B3-B98F-BA60F6481313}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.SDMSample.Tests", "tests\SDMSample\System.Xml.Linq.SDMSample.Tests.csproj", "{F6C73170-9333-4B52-B3FA-A536C5EA6A48}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Streaming.Tests", "tests\Streaming\System.Xml.Linq.Streaming.Tests.csproj", "{CB11B315-2567-4574-977D-89E3135243C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.TreeManipulation.Tests", "tests\TreeManipulation\System.Xml.Linq.TreeManipulation.Tests.csproj", "{10EFE488-FAB4-43DA-847D-FF057BFF52AC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XDocument.Common", "tests\XDocument.Common\XDocument.Common.csproj", "{52666206-B6C9-49FA-A1D7-D0A0C68807B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XDocument.Test.ModuleCore", "tests\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj", "{979510CE-9042-4F8D-9C74-EE03B89194CC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.xNodeBuilder.Tests", "tests\xNodeBuilder\System.Xml.Linq.xNodeBuilder.Tests.csproj", "{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.xNodeReader.Tests", "tests\xNodeReader\System.Xml.Linq.xNodeReader.Tests.csproj", "{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument.Tests", "tests\XPath\XDocument\System.Xml.XPath.XDocument.Tests.csproj", "{10D52320-17B7-476E-BBD2-A1064DD38CBF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {BAC347A3-9841-44FC-B1E3-2344D1152C23}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "src\System.Private.Xml.Linq.csproj", "{BAC347A3-9841-44FC-B1E3-2344D1152C23}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A0BD1D6-4D2F-4EBA-8879-CA3D275BD091}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{A62B2854-84B0-494C-A433-865E24232408}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModuleCore", "..\Common\tests\System\Xml\ModuleCore\ModuleCore.csproj", "{FF12ED5F-0571-4DDB-B1E9-E36B23065870}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlCoreTest", "..\Common\tests\System\Xml\XmlCoreTest\XmlCoreTest.csproj", "{20740FAE-E603-4B42-B1E1-E16F8212E9AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDiff", "..\Common\tests\System\Xml\XmlDiff\XmlDiff.csproj", "{096B8A3A-24EE-4A75-B5E1-9F584D9D74F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9FB88324-6915-4049-A298-554BE6EF9AAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D22408AB-0F46-49DE-B979-EAC88A29EB81}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "src\System.Private.Xml.Linq.csproj", "{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Axes.Tests", "tests\axes\System.Xml.Linq.Axes.Tests.csproj", "{9865C9E7-0587-4023-8585-B96AE88C5FEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Events.Tests", "tests\events\System.Xml.Linq.Events.Tests.csproj", "{21437332-971D-416D-9D2C-55DFA5CB88A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Misc.Tests", "tests\misc\System.Xml.Linq.Misc.Tests.csproj", "{859DED50-8874-4472-93B3-49A7C3E315FA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Properties.Tests", "tests\Properties\System.Xml.Linq.Properties.Tests.csproj", "{386DCBD1-1C6F-4D8A-A9A7-D3C7CEC1F59A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Schema.Extensions.Tests", "tests\Schema\System.Xml.Schema.Extensions.Tests.csproj", "{9E13FE06-372B-4E2B-8A3E-DAD793DFFFC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.SDMSample.Tests", "tests\SDMSample\System.Xml.Linq.SDMSample.Tests.csproj", "{4AC95E62-1DBE-4017-A8EE-6FF27C56186A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.Streaming.Tests", "tests\Streaming\System.Xml.Linq.Streaming.Tests.csproj", "{E174C25D-F802-417F-ADB4-11E3712D6378}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.TreeManipulation.Tests", "tests\TreeManipulation\System.Xml.Linq.TreeManipulation.Tests.csproj", "{160D6CB5-B85B-4414-9252-EF58DEC303F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XDocument.Common", "tests\XDocument.Common\XDocument.Common.csproj", "{C3FCD580-CB45-450C-8BFB-2E985C952338}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XDocument.Test.ModuleCore", "tests\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj", "{0B05F02C-9E65-422F-8192-D06CAF7D6DD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.xNodeBuilder.Tests", "tests\xNodeBuilder\System.Xml.Linq.xNodeBuilder.Tests.csproj", "{146FEC0E-2AF0-47B4-8F95-8E64F91D1147}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Linq.xNodeReader.Tests", "tests\xNodeReader\System.Xml.Linq.xNodeReader.Tests.csproj", "{8720F0F6-D1E2-4699-8B83-638A85ACFB2E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument.Tests", "tests\XPath\XDocument\System.Xml.XPath.XDocument.Tests.csproj", "{557CBDC5-16E6-44FD-B34B-6386AFDC300D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{28B0CB77-2187-4CCD-8190-283FCA9800B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F442C967-0D66-4EFF-8875-1D165AA80621}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{C4EF205E-7187-4245-968D-0BEAF5FD1705}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{DA4D68E6-A21C-425A-8728-6EF3A57348BA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E1C6C12F-E1F4-4420-B554-62F204C4C028}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7079B273-3194-4711-B4BB-2045A5CFBED5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{FF12ED5F-0571-4DDB-B1E9-E36B23065870} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{20740FAE-E603-4B42-B1E1-E16F8212E9AA} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{096B8A3A-24EE-4A75-B5E1-9F584D9D74F1} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{9FB88324-6915-4049-A298-554BE6EF9AAA} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{9865C9E7-0587-4023-8585-B96AE88C5FEC} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{21437332-971D-416D-9D2C-55DFA5CB88A2} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{859DED50-8874-4472-93B3-49A7C3E315FA} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{386DCBD1-1C6F-4D8A-A9A7-D3C7CEC1F59A} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{9E13FE06-372B-4E2B-8A3E-DAD793DFFFC8} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{4AC95E62-1DBE-4017-A8EE-6FF27C56186A} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{E174C25D-F802-417F-ADB4-11E3712D6378} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{160D6CB5-B85B-4414-9252-EF58DEC303F2} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{C3FCD580-CB45-450C-8BFB-2E985C952338} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{0B05F02C-9E65-422F-8192-D06CAF7D6DD6} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{146FEC0E-2AF0-47B4-8F95-8E64F91D1147} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{8720F0F6-D1E2-4699-8B83-638A85ACFB2E} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{557CBDC5-16E6-44FD-B34B-6386AFDC300D} = {FAB95B67-71BE-4BFB-89F4-6DFF84AFD7AD}
+		{D22408AB-0F46-49DE-B979-EAC88A29EB81} = {E1C6C12F-E1F4-4420-B554-62F204C4C028}
+		{28B0CB77-2187-4CCD-8190-283FCA9800B1} = {E1C6C12F-E1F4-4420-B554-62F204C4C028}
+		{C4EF205E-7187-4245-968D-0BEAF5FD1705} = {E1C6C12F-E1F4-4420-B554-62F204C4C028}
+		{DA4D68E6-A21C-425A-8728-6EF3A57348BA} = {E1C6C12F-E1F4-4420-B554-62F204C4C028}
+		{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD} = {7079B273-3194-4711-B4BB-2045A5CFBED5}
+		{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B} = {7079B273-3194-4711-B4BB-2045A5CFBED5}
+		{F442C967-0D66-4EFF-8875-1D165AA80621} = {7079B273-3194-4711-B4BB-2045A5CFBED5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C560E194-5B14-4112-ABC6-3208491E53E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C560E194-5B14-4112-ABC6-3208491E53E6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D24E2563-7A46-4368-94D4-B3A39E9EF1B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFB408EA-2EF7-42B3-B98F-BA60F6481313}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6C73170-9333-4B52-B3FA-A536C5EA6A48}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB11B315-2567-4574-977D-89E3135243C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB11B315-2567-4574-977D-89E3135243C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10EFE488-FAB4-43DA-847D-FF057BFF52AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52666206-B6C9-49FA-A1D7-D0A0C68807B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{979510CE-9042-4F8D-9C74-EE03B89194CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{979510CE-9042-4F8D-9C74-EE03B89194CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{10D52320-17B7-476E-BBD2-A1064DD38CBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A0BD1D6-4D2F-4EBA-8879-CA3D275BD091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A0BD1D6-4D2F-4EBA-8879-CA3D275BD091}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A0BD1D6-4D2F-4EBA-8879-CA3D275BD091}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A0BD1D6-4D2F-4EBA-8879-CA3D275BD091}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A62B2854-84B0-494C-A433-865E24232408}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A62B2854-84B0-494C-A433-865E24232408}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A62B2854-84B0-494C-A433-865E24232408}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A62B2854-84B0-494C-A433-865E24232408}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF12ED5F-0571-4DDB-B1E9-E36B23065870}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF12ED5F-0571-4DDB-B1E9-E36B23065870}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF12ED5F-0571-4DDB-B1E9-E36B23065870}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF12ED5F-0571-4DDB-B1E9-E36B23065870}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20740FAE-E603-4B42-B1E1-E16F8212E9AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20740FAE-E603-4B42-B1E1-E16F8212E9AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20740FAE-E603-4B42-B1E1-E16F8212E9AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20740FAE-E603-4B42-B1E1-E16F8212E9AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{096B8A3A-24EE-4A75-B5E1-9F584D9D74F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{096B8A3A-24EE-4A75-B5E1-9F584D9D74F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{096B8A3A-24EE-4A75-B5E1-9F584D9D74F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{096B8A3A-24EE-4A75-B5E1-9F584D9D74F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FB88324-6915-4049-A298-554BE6EF9AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FB88324-6915-4049-A298-554BE6EF9AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FB88324-6915-4049-A298-554BE6EF9AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FB88324-6915-4049-A298-554BE6EF9AAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D22408AB-0F46-49DE-B979-EAC88A29EB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D22408AB-0F46-49DE-B979-EAC88A29EB81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D22408AB-0F46-49DE-B979-EAC88A29EB81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D22408AB-0F46-49DE-B979-EAC88A29EB81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61FD926A-2ED8-4CA5-8D75-854C8C9D9CCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9865C9E7-0587-4023-8585-B96AE88C5FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9865C9E7-0587-4023-8585-B96AE88C5FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9865C9E7-0587-4023-8585-B96AE88C5FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9865C9E7-0587-4023-8585-B96AE88C5FEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21437332-971D-416D-9D2C-55DFA5CB88A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21437332-971D-416D-9D2C-55DFA5CB88A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21437332-971D-416D-9D2C-55DFA5CB88A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21437332-971D-416D-9D2C-55DFA5CB88A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{859DED50-8874-4472-93B3-49A7C3E315FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{859DED50-8874-4472-93B3-49A7C3E315FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{859DED50-8874-4472-93B3-49A7C3E315FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{859DED50-8874-4472-93B3-49A7C3E315FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{386DCBD1-1C6F-4D8A-A9A7-D3C7CEC1F59A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{386DCBD1-1C6F-4D8A-A9A7-D3C7CEC1F59A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{386DCBD1-1C6F-4D8A-A9A7-D3C7CEC1F59A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{386DCBD1-1C6F-4D8A-A9A7-D3C7CEC1F59A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E13FE06-372B-4E2B-8A3E-DAD793DFFFC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E13FE06-372B-4E2B-8A3E-DAD793DFFFC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E13FE06-372B-4E2B-8A3E-DAD793DFFFC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E13FE06-372B-4E2B-8A3E-DAD793DFFFC8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AC95E62-1DBE-4017-A8EE-6FF27C56186A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AC95E62-1DBE-4017-A8EE-6FF27C56186A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AC95E62-1DBE-4017-A8EE-6FF27C56186A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AC95E62-1DBE-4017-A8EE-6FF27C56186A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E174C25D-F802-417F-ADB4-11E3712D6378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E174C25D-F802-417F-ADB4-11E3712D6378}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E174C25D-F802-417F-ADB4-11E3712D6378}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E174C25D-F802-417F-ADB4-11E3712D6378}.Release|Any CPU.Build.0 = Release|Any CPU
+		{160D6CB5-B85B-4414-9252-EF58DEC303F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{160D6CB5-B85B-4414-9252-EF58DEC303F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{160D6CB5-B85B-4414-9252-EF58DEC303F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{160D6CB5-B85B-4414-9252-EF58DEC303F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3FCD580-CB45-450C-8BFB-2E985C952338}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3FCD580-CB45-450C-8BFB-2E985C952338}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3FCD580-CB45-450C-8BFB-2E985C952338}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3FCD580-CB45-450C-8BFB-2E985C952338}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B05F02C-9E65-422F-8192-D06CAF7D6DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B05F02C-9E65-422F-8192-D06CAF7D6DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B05F02C-9E65-422F-8192-D06CAF7D6DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B05F02C-9E65-422F-8192-D06CAF7D6DD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{146FEC0E-2AF0-47B4-8F95-8E64F91D1147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{146FEC0E-2AF0-47B4-8F95-8E64F91D1147}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{146FEC0E-2AF0-47B4-8F95-8E64F91D1147}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{146FEC0E-2AF0-47B4-8F95-8E64F91D1147}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8720F0F6-D1E2-4699-8B83-638A85ACFB2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8720F0F6-D1E2-4699-8B83-638A85ACFB2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8720F0F6-D1E2-4699-8B83-638A85ACFB2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8720F0F6-D1E2-4699-8B83-638A85ACFB2E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{557CBDC5-16E6-44FD-B34B-6386AFDC300D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{557CBDC5-16E6-44FD-B34B-6386AFDC300D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{557CBDC5-16E6-44FD-B34B-6386AFDC300D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{557CBDC5-16E6-44FD-B34B-6386AFDC300D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4F479E3-A0AD-4646-BD4B-F3CD2C29046B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28B0CB77-2187-4CCD-8190-283FCA9800B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28B0CB77-2187-4CCD-8190-283FCA9800B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28B0CB77-2187-4CCD-8190-283FCA9800B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28B0CB77-2187-4CCD-8190-283FCA9800B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F442C967-0D66-4EFF-8875-1D165AA80621}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F442C967-0D66-4EFF-8875-1D165AA80621}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F442C967-0D66-4EFF-8875-1D165AA80621}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F442C967-0D66-4EFF-8875-1D165AA80621}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4EF205E-7187-4245-968D-0BEAF5FD1705}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4EF205E-7187-4245-968D-0BEAF5FD1705}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4EF205E-7187-4245-968D-0BEAF5FD1705}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4EF205E-7187-4245-968D-0BEAF5FD1705}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA4D68E6-A21C-425A-8728-6EF3A57348BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA4D68E6-A21C-425A-8728-6EF3A57348BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA4D68E6-A21C-425A-8728-6EF3A57348BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA4D68E6-A21C-425A-8728-6EF3A57348BA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6D9B0285-5E8A-4C20-9C53-9E2084EF64C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C560E194-5B14-4112-ABC6-3208491E53E6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{35FA1FA9-A504-4B9E-93F0-E5D03C21BECA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D24E2563-7A46-4368-94D4-B3A39E9EF1B5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AFB408EA-2EF7-42B3-B98F-BA60F6481313} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F6C73170-9333-4B52-B3FA-A536C5EA6A48} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{CB11B315-2567-4574-977D-89E3135243C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{10EFE488-FAB4-43DA-847D-FF057BFF52AC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{52666206-B6C9-49FA-A1D7-D0A0C68807B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{979510CE-9042-4F8D-9C74-EE03B89194CC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5D4FB9ED-C3AC-4EFA-9FEE-619ED4B4B92D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6E1C5358-7F04-4791-8B5F-6A5A4E42ABF1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{10D52320-17B7-476E-BBD2-A1064DD38CBF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BAC347A3-9841-44FC-B1E3-2344D1152C23} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{6A0BD1D6-4D2F-4EBA-8879-CA3D275BD091} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A62B2854-84B0-494C-A433-865E24232408} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2051658A-0B9D-4CAB-B8B8-25E01EEC8E44}
+		SolutionGuid = {466CF638-AFDA-4A38-97EF-C87ED7B93443}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Private.Xml/System.Private.Xml.sln b/src/libraries/System.Private.Xml/System.Private.Xml.sln
index 4abcd29f959053..2b992f3f58a7bc 100644
--- a/src/libraries/System.Private.Xml/System.Private.Xml.sln
+++ b/src/libraries/System.Private.Xml/System.Private.Xml.sln
@@ -1,318 +1,296 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Misc.Tests", "tests\Misc\System.Xml.Misc.Tests.csproj", "{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.CharCheckingReader.Tests", "tests\Readers\CharCheckingReader\System.Xml.RW.CharCheckingReader.Tests.csproj", "{6DC15D23-8213-4700-9815-AD8DEED1CE5F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.CustomReader.Tests", "tests\Readers\CustomReader\System.Xml.RW.CustomReader.Tests.csproj", "{B51913C2-478E-46AA-A523-521BD4593651}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.FactoryReader.Tests", "tests\Readers\FactoryReader\System.Xml.RW.FactoryReader.Tests.csproj", "{04C5492C-FA54-4F93-8698-44B8BB7C72E0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.NameTable.Tests", "tests\Readers\NameTable\System.Xml.RW.NameTable.Tests.csproj", "{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.ReaderSettings.Tests", "tests\Readers\ReaderSettings\System.Xml.RW.ReaderSettings.Tests.csproj", "{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.SubtreeReader.Tests", "tests\Readers\SubtreeReader\System.Xml.RW.SubtreeReader.Tests.csproj", "{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.WrappedReader.Tests", "tests\Readers\WrappedReader\System.Xml.RW.WrappedReader.Tests.csproj", "{1C8F67D6-1953-49D3-B716-F298883A79C6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.RwFactory.Tests", "tests\Writers\RwFactory\System.Xml.RW.RwFactory.Tests.csproj", "{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlWriterApi.Tests", "tests\Writers\XmlWriterApi\System.Xml.RW.XmlWriterApi.Tests.csproj", "{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlConvert.Tests", "tests\XmlConvert\System.Xml.RW.XmlConvert.Tests.csproj", "{3F18D20D-0267-4381-857B-EEDB7B3FC549}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument.Tests", "tests\XmlDocument\System.Xml.XmlDocument.Tests.csproj", "{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlNodeReader.Tests", "tests\XmlNodeReader\System.Xml.XmlNodeReader.Tests\System.Xml.XmlNodeReader.Tests.csproj", "{6C6F323D-054E-4723-9DEA-1C5E1E45DF88}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlReader.ReadContentAs.Tests", "tests\XmlReader\ReadContentAs\System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj", "{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlReader.Tests", "tests\XmlReader\Tests\System.Xml.RW.XmlReader.Tests.csproj", "{507DB29F-74F5-4B34-A240-ABE7BD168DF6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlSystemPathResolver.Tests", "tests\XmlReader\XmlResolver\System.Xml.RW.XmlSystemPathResolver.Tests.csproj", "{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlReaderLib", "tests\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj", "{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlResolver.Tests", "tests\XmlResolver\System.Xml.XmlResolver.Tests\System.Xml.XmlResolver.Tests.csproj", "{F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSchemaSet.Tests", "tests\XmlSchema\XmlSchemaSet\System.Xml.XmlSchemaSet.Tests.csproj", "{9EDAADA8-B658-430F-97EE-CCA494883D86}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests", "tests\XmlSchema\XmlSchemaValidatorApi\System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj", "{B0F53AAA-4ABC-44B2-9331-D3802340DD20}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer.ReflectionOnly.Tests", "tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer.Tests", "tests\XmlSerializer\System.Xml.XmlSerializer.Tests.csproj", "{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlWriter.Tests", "tests\XmlWriter\System.Xml.RW.XmlWriter.Tests.csproj", "{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XmlDocument.Tests", "tests\XPath\XmlDocument\System.Xml.XPath.XmlDocument.Tests.csproj", "{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.Tests", "tests\XPath\XPathDocument\System.Xml.XPath.Tests.csproj", "{D0DF902A-2486-4A38-B7A7-232B9B6590E1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Xsl.XslCompiledTransformApi.Tests", "tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj", "{B01E2AE1-1B52-4518-B32E-016070356A7F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XsltCompiler.Tests", "tests\Xslt\XsltCompiler\XsltCompiler.Tests.csproj", "{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Xsl.XslTransformApi.Tests", "tests\Xslt\XslTransformApi\System.Xml.Xsl.XslTransformApi.Tests.csproj", "{ACF79A18-2655-452C-B4AC-10125F0AD7A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "src\System.Private.Xml.csproj", "{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DBC272A5-C0EE-4FD3-B6F4-EF0C18DF168B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseLibManaged", "..\Common\tests\System\Xml\BaseLibManaged\BaseLibManaged.csproj", "{301E53B9-AF30-4759-953B-8C2396D96E41}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ModuleCore", "..\Common\tests\System\Xml\ModuleCore\ModuleCore.csproj", "{497F8F6C-CE19-4B51-9A6E-5176231F22F3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlCoreTest", "..\Common\tests\System\Xml\XmlCoreTest\XmlCoreTest.csproj", "{E9C8AF65-4553-42C7-8E8A-6EBC12B473B5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmlDiff", "..\Common\tests\System\Xml\XmlDiff\XmlDiff.csproj", "{ADD6F934-4933-47A1-A700-AA63D6474097}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6222F04D-AF3C-4CA3-A564-F4FED0A60F64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{CA3E9C20-D073-4CC5-B288-25A2F19297E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "src\System.Private.Xml.csproj", "{B49AD269-3938-4F33-AEF8-029D3A94138F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Misc.Tests", "tests\Misc\System.Xml.Misc.Tests.csproj", "{A1DBA542-0E3C-4767-9BDB-58238C195856}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.CharCheckingReader.Tests", "tests\Readers\CharCheckingReader\System.Xml.RW.CharCheckingReader.Tests.csproj", "{EF288754-66B1-4E80-8044-2D69EBB0F121}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.CustomReader.Tests", "tests\Readers\CustomReader\System.Xml.RW.CustomReader.Tests.csproj", "{AE2A48D5-AA4E-4B0D-875B-2624B23D79E1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.FactoryReader.Tests", "tests\Readers\FactoryReader\System.Xml.RW.FactoryReader.Tests.csproj", "{F0955347-9034-42BA-9924-E6245E813B6C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.NameTable.Tests", "tests\Readers\NameTable\System.Xml.RW.NameTable.Tests.csproj", "{6E1952A6-B2A2-4552-8BF9-19BF78005B8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.ReaderSettings.Tests", "tests\Readers\ReaderSettings\System.Xml.RW.ReaderSettings.Tests.csproj", "{760E5C8B-1DEE-485C-AC58-86723AF12749}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.SubtreeReader.Tests", "tests\Readers\SubtreeReader\System.Xml.RW.SubtreeReader.Tests.csproj", "{48D22D17-2757-43E8-9A8C-2C53165C7271}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.WrappedReader.Tests", "tests\Readers\WrappedReader\System.Xml.RW.WrappedReader.Tests.csproj", "{F1EA6D30-052C-4BAF-A6C7-4B2A1F4A4AE5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.RwFactory.Tests", "tests\Writers\RwFactory\System.Xml.RW.RwFactory.Tests.csproj", "{7D132F1D-BE7F-475A-8E03-5E1579DB79B7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlWriterApi.Tests", "tests\Writers\XmlWriterApi\System.Xml.RW.XmlWriterApi.Tests.csproj", "{4EAFAB71-A5E3-41AB-8F84-EBD5D36DF9E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlConvert.Tests", "tests\XmlConvert\System.Xml.RW.XmlConvert.Tests.csproj", "{43C406AC-9304-4FE4-8A32-7C6C4286E1C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument.Tests", "tests\XmlDocument\System.Xml.XmlDocument.Tests.csproj", "{6CDEE0F7-3E0E-4EDD-91B0-2B1A56ED6109}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlNodeReader.Tests", "tests\XmlNodeReader\System.Xml.XmlNodeReader.Tests\System.Xml.XmlNodeReader.Tests.csproj", "{ECEE9717-ECE3-4F62-8C65-CEED1A76DFDF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlReader.ReadContentAs.Tests", "tests\XmlReader\ReadContentAs\System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj", "{64194137-008E-491D-9258-C07C0389ADB9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlReader.Tests", "tests\XmlReader\Tests\System.Xml.RW.XmlReader.Tests.csproj", "{EA178A11-E0EF-456F-A7E6-D50B3296275B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlSystemPathResolver.Tests", "tests\XmlReader\XmlResolver\System.Xml.RW.XmlSystemPathResolver.Tests.csproj", "{70CFC896-B150-4DD7-86B0-3981A128CDA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlReaderLib", "tests\XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj", "{64441DE6-F486-411A-B965-F12785171B38}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlResolver.Tests", "tests\XmlResolver\System.Xml.XmlResolver.Tests\System.Xml.XmlResolver.Tests.csproj", "{8B8DF798-5C25-454A-9CE5-D2170BB91CA1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSchemaSet.Tests", "tests\XmlSchema\XmlSchemaSet\System.Xml.XmlSchemaSet.Tests.csproj", "{F8E21282-5C68-4F45-B25D-015A6473EDFA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests", "tests\XmlSchema\XmlSchemaValidatorApi\System.Xml.XmlSchema.XmlSchemaValidatorApi.Tests.csproj", "{1C4E51A4-3349-4408-AB8F-3F0CCAAD72C6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer.ReflectionOnly.Tests", "tests\XmlSerializer\ReflectionOnly\System.Xml.XmlSerializer.ReflectionOnly.Tests.csproj", "{AD461557-2DDB-4A3C-8433-FFB5E31A5E6F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer.Tests", "tests\XmlSerializer\System.Xml.XmlSerializer.Tests.csproj", "{91C2929B-7AB0-4B58-84B4-BB6335140557}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlWriter.Tests", "tests\XmlWriter\System.Xml.RW.XmlWriter.Tests.csproj", "{8C42EA3F-0619-4541-ACC1-D667882A513D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XmlDocument.Tests", "tests\XPath\XmlDocument\System.Xml.XPath.XmlDocument.Tests.csproj", "{8C4495D3-EC0D-49FB-B49F-31F326BE3B7C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.Tests", "tests\XPath\XPathDocument\System.Xml.XPath.Tests.csproj", "{2ACA294D-34E5-476C-B978-DE6FA028318E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Xsl.XslCompiledTransformApi.Tests", "tests\Xslt\XslCompiledTransformApi\System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj", "{A2B94467-3E3E-4632-B76A-4820CF43EDA0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XsltCompiler.Tests", "tests\Xslt\XsltCompiler\XsltCompiler.Tests.csproj", "{4A49FD39-51EF-42F4-AEF9-C60880FC41B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.Xsl.XslTransformApi.Tests", "tests\Xslt\XslTransformApi\System.Xml.Xsl.XslTransformApi.Tests.csproj", "{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D85F5D9C-A068-4F04-B081-0A3E20CB5D49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8FB84342-2953-4B59-91B8-7BF3AE37172D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{80A7F7CE-9235-45CD-A195-E031AB3E1EAA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{090DA31F-6284-45AD-9010-EC6E96AFD07E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A9D6C907-39E4-4ECA-BA9B-2392B98C1D49}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3795B225-029E-4C03-B593-1527DDF93182}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{301E53B9-AF30-4759-953B-8C2396D96E41} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{497F8F6C-CE19-4B51-9A6E-5176231F22F3} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{E9C8AF65-4553-42C7-8E8A-6EBC12B473B5} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{ADD6F934-4933-47A1-A700-AA63D6474097} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{6222F04D-AF3C-4CA3-A564-F4FED0A60F64} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{A1DBA542-0E3C-4767-9BDB-58238C195856} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{EF288754-66B1-4E80-8044-2D69EBB0F121} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{AE2A48D5-AA4E-4B0D-875B-2624B23D79E1} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{F0955347-9034-42BA-9924-E6245E813B6C} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{6E1952A6-B2A2-4552-8BF9-19BF78005B8D} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{760E5C8B-1DEE-485C-AC58-86723AF12749} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{48D22D17-2757-43E8-9A8C-2C53165C7271} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{F1EA6D30-052C-4BAF-A6C7-4B2A1F4A4AE5} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{7D132F1D-BE7F-475A-8E03-5E1579DB79B7} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{4EAFAB71-A5E3-41AB-8F84-EBD5D36DF9E5} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{43C406AC-9304-4FE4-8A32-7C6C4286E1C6} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{6CDEE0F7-3E0E-4EDD-91B0-2B1A56ED6109} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{ECEE9717-ECE3-4F62-8C65-CEED1A76DFDF} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{64194137-008E-491D-9258-C07C0389ADB9} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{EA178A11-E0EF-456F-A7E6-D50B3296275B} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{70CFC896-B150-4DD7-86B0-3981A128CDA1} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{64441DE6-F486-411A-B965-F12785171B38} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{8B8DF798-5C25-454A-9CE5-D2170BB91CA1} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{F8E21282-5C68-4F45-B25D-015A6473EDFA} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{1C4E51A4-3349-4408-AB8F-3F0CCAAD72C6} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{AD461557-2DDB-4A3C-8433-FFB5E31A5E6F} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{91C2929B-7AB0-4B58-84B4-BB6335140557} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{8C42EA3F-0619-4541-ACC1-D667882A513D} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{8C4495D3-EC0D-49FB-B49F-31F326BE3B7C} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{2ACA294D-34E5-476C-B978-DE6FA028318E} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{A2B94467-3E3E-4632-B76A-4820CF43EDA0} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{4A49FD39-51EF-42F4-AEF9-C60880FC41B3} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{BBB6623D-BDF2-41B6-9165-A22A6C4D4159} = {090DA31F-6284-45AD-9010-EC6E96AFD07E}
+		{CA3E9C20-D073-4CC5-B288-25A2F19297E8} = {A9D6C907-39E4-4ECA-BA9B-2392B98C1D49}
+		{D85F5D9C-A068-4F04-B081-0A3E20CB5D49} = {A9D6C907-39E4-4ECA-BA9B-2392B98C1D49}
+		{8FB84342-2953-4B59-91B8-7BF3AE37172D} = {A9D6C907-39E4-4ECA-BA9B-2392B98C1D49}
+		{80A7F7CE-9235-45CD-A195-E031AB3E1EAA} = {A9D6C907-39E4-4ECA-BA9B-2392B98C1D49}
+		{B49AD269-3938-4F33-AEF8-029D3A94138F} = {3795B225-029E-4C03-B593-1527DDF93182}
+		{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7} = {3795B225-029E-4C03-B593-1527DDF93182}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A30BBA60-647C-4565-A42F-BE60B2CA2E8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DC15D23-8213-4700-9815-AD8DEED1CE5F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B51913C2-478E-46AA-A523-521BD4593651}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B51913C2-478E-46AA-A523-521BD4593651}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04C5492C-FA54-4F93-8698-44B8BB7C72E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C8F67D6-1953-49D3-B716-F298883A79C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C8F67D6-1953-49D3-B716-F298883A79C6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F18D20D-0267-4381-857B-EEDB7B3FC549}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F18D20D-0267-4381-857B-EEDB7B3FC549}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C6F323D-054E-4723-9DEA-1C5E1E45DF88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{507DB29F-74F5-4B34-A240-ABE7BD168DF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F05DE950-CA99-42A8-B44D-E7DAA5C3C783}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EDAADA8-B658-430F-97EE-CCA494883D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EDAADA8-B658-430F-97EE-CCA494883D86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0F53AAA-4ABC-44B2-9331-D3802340DD20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F955518C4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0DF902A-2486-4A38-B7A7-232B9B6590E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B01E2AE1-1B52-4518-B32E-016070356A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B01E2AE1-1B52-4518-B32E-016070356A7F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACF79A18-2655-452C-B4AC-10125F0AD7A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBC272A5-C0EE-4FD3-B6F4-EF0C18DF168B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBC272A5-C0EE-4FD3-B6F4-EF0C18DF168B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBC272A5-C0EE-4FD3-B6F4-EF0C18DF168B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBC272A5-C0EE-4FD3-B6F4-EF0C18DF168B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{301E53B9-AF30-4759-953B-8C2396D96E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{301E53B9-AF30-4759-953B-8C2396D96E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{301E53B9-AF30-4759-953B-8C2396D96E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{301E53B9-AF30-4759-953B-8C2396D96E41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{497F8F6C-CE19-4B51-9A6E-5176231F22F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{497F8F6C-CE19-4B51-9A6E-5176231F22F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{497F8F6C-CE19-4B51-9A6E-5176231F22F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{497F8F6C-CE19-4B51-9A6E-5176231F22F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9C8AF65-4553-42C7-8E8A-6EBC12B473B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9C8AF65-4553-42C7-8E8A-6EBC12B473B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9C8AF65-4553-42C7-8E8A-6EBC12B473B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9C8AF65-4553-42C7-8E8A-6EBC12B473B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADD6F934-4933-47A1-A700-AA63D6474097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADD6F934-4933-47A1-A700-AA63D6474097}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADD6F934-4933-47A1-A700-AA63D6474097}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADD6F934-4933-47A1-A700-AA63D6474097}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6222F04D-AF3C-4CA3-A564-F4FED0A60F64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA3E9C20-D073-4CC5-B288-25A2F19297E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA3E9C20-D073-4CC5-B288-25A2F19297E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA3E9C20-D073-4CC5-B288-25A2F19297E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA3E9C20-D073-4CC5-B288-25A2F19297E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B49AD269-3938-4F33-AEF8-029D3A94138F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B49AD269-3938-4F33-AEF8-029D3A94138F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B49AD269-3938-4F33-AEF8-029D3A94138F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B49AD269-3938-4F33-AEF8-029D3A94138F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1DBA542-0E3C-4767-9BDB-58238C195856}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1DBA542-0E3C-4767-9BDB-58238C195856}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1DBA542-0E3C-4767-9BDB-58238C195856}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1DBA542-0E3C-4767-9BDB-58238C195856}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF288754-66B1-4E80-8044-2D69EBB0F121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF288754-66B1-4E80-8044-2D69EBB0F121}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF288754-66B1-4E80-8044-2D69EBB0F121}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF288754-66B1-4E80-8044-2D69EBB0F121}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE2A48D5-AA4E-4B0D-875B-2624B23D79E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE2A48D5-AA4E-4B0D-875B-2624B23D79E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE2A48D5-AA4E-4B0D-875B-2624B23D79E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE2A48D5-AA4E-4B0D-875B-2624B23D79E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0955347-9034-42BA-9924-E6245E813B6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0955347-9034-42BA-9924-E6245E813B6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0955347-9034-42BA-9924-E6245E813B6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0955347-9034-42BA-9924-E6245E813B6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E1952A6-B2A2-4552-8BF9-19BF78005B8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E1952A6-B2A2-4552-8BF9-19BF78005B8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E1952A6-B2A2-4552-8BF9-19BF78005B8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E1952A6-B2A2-4552-8BF9-19BF78005B8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{760E5C8B-1DEE-485C-AC58-86723AF12749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{760E5C8B-1DEE-485C-AC58-86723AF12749}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{760E5C8B-1DEE-485C-AC58-86723AF12749}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{760E5C8B-1DEE-485C-AC58-86723AF12749}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48D22D17-2757-43E8-9A8C-2C53165C7271}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48D22D17-2757-43E8-9A8C-2C53165C7271}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48D22D17-2757-43E8-9A8C-2C53165C7271}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48D22D17-2757-43E8-9A8C-2C53165C7271}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1EA6D30-052C-4BAF-A6C7-4B2A1F4A4AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1EA6D30-052C-4BAF-A6C7-4B2A1F4A4AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1EA6D30-052C-4BAF-A6C7-4B2A1F4A4AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1EA6D30-052C-4BAF-A6C7-4B2A1F4A4AE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D132F1D-BE7F-475A-8E03-5E1579DB79B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D132F1D-BE7F-475A-8E03-5E1579DB79B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D132F1D-BE7F-475A-8E03-5E1579DB79B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D132F1D-BE7F-475A-8E03-5E1579DB79B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EAFAB71-A5E3-41AB-8F84-EBD5D36DF9E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EAFAB71-A5E3-41AB-8F84-EBD5D36DF9E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EAFAB71-A5E3-41AB-8F84-EBD5D36DF9E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EAFAB71-A5E3-41AB-8F84-EBD5D36DF9E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43C406AC-9304-4FE4-8A32-7C6C4286E1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43C406AC-9304-4FE4-8A32-7C6C4286E1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43C406AC-9304-4FE4-8A32-7C6C4286E1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43C406AC-9304-4FE4-8A32-7C6C4286E1C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6CDEE0F7-3E0E-4EDD-91B0-2B1A56ED6109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6CDEE0F7-3E0E-4EDD-91B0-2B1A56ED6109}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6CDEE0F7-3E0E-4EDD-91B0-2B1A56ED6109}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6CDEE0F7-3E0E-4EDD-91B0-2B1A56ED6109}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECEE9717-ECE3-4F62-8C65-CEED1A76DFDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECEE9717-ECE3-4F62-8C65-CEED1A76DFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECEE9717-ECE3-4F62-8C65-CEED1A76DFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECEE9717-ECE3-4F62-8C65-CEED1A76DFDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64194137-008E-491D-9258-C07C0389ADB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64194137-008E-491D-9258-C07C0389ADB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64194137-008E-491D-9258-C07C0389ADB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64194137-008E-491D-9258-C07C0389ADB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA178A11-E0EF-456F-A7E6-D50B3296275B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA178A11-E0EF-456F-A7E6-D50B3296275B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA178A11-E0EF-456F-A7E6-D50B3296275B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA178A11-E0EF-456F-A7E6-D50B3296275B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70CFC896-B150-4DD7-86B0-3981A128CDA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70CFC896-B150-4DD7-86B0-3981A128CDA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70CFC896-B150-4DD7-86B0-3981A128CDA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70CFC896-B150-4DD7-86B0-3981A128CDA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64441DE6-F486-411A-B965-F12785171B38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64441DE6-F486-411A-B965-F12785171B38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64441DE6-F486-411A-B965-F12785171B38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64441DE6-F486-411A-B965-F12785171B38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B8DF798-5C25-454A-9CE5-D2170BB91CA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B8DF798-5C25-454A-9CE5-D2170BB91CA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B8DF798-5C25-454A-9CE5-D2170BB91CA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B8DF798-5C25-454A-9CE5-D2170BB91CA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8E21282-5C68-4F45-B25D-015A6473EDFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8E21282-5C68-4F45-B25D-015A6473EDFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8E21282-5C68-4F45-B25D-015A6473EDFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8E21282-5C68-4F45-B25D-015A6473EDFA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C4E51A4-3349-4408-AB8F-3F0CCAAD72C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C4E51A4-3349-4408-AB8F-3F0CCAAD72C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C4E51A4-3349-4408-AB8F-3F0CCAAD72C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C4E51A4-3349-4408-AB8F-3F0CCAAD72C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD461557-2DDB-4A3C-8433-FFB5E31A5E6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD461557-2DDB-4A3C-8433-FFB5E31A5E6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD461557-2DDB-4A3C-8433-FFB5E31A5E6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD461557-2DDB-4A3C-8433-FFB5E31A5E6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91C2929B-7AB0-4B58-84B4-BB6335140557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91C2929B-7AB0-4B58-84B4-BB6335140557}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91C2929B-7AB0-4B58-84B4-BB6335140557}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91C2929B-7AB0-4B58-84B4-BB6335140557}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C42EA3F-0619-4541-ACC1-D667882A513D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C42EA3F-0619-4541-ACC1-D667882A513D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C42EA3F-0619-4541-ACC1-D667882A513D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C42EA3F-0619-4541-ACC1-D667882A513D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C4495D3-EC0D-49FB-B49F-31F326BE3B7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C4495D3-EC0D-49FB-B49F-31F326BE3B7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C4495D3-EC0D-49FB-B49F-31F326BE3B7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C4495D3-EC0D-49FB-B49F-31F326BE3B7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2ACA294D-34E5-476C-B978-DE6FA028318E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2ACA294D-34E5-476C-B978-DE6FA028318E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2ACA294D-34E5-476C-B978-DE6FA028318E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2ACA294D-34E5-476C-B978-DE6FA028318E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2B94467-3E3E-4632-B76A-4820CF43EDA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2B94467-3E3E-4632-B76A-4820CF43EDA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2B94467-3E3E-4632-B76A-4820CF43EDA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2B94467-3E3E-4632-B76A-4820CF43EDA0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A49FD39-51EF-42F4-AEF9-C60880FC41B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A49FD39-51EF-42F4-AEF9-C60880FC41B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A49FD39-51EF-42F4-AEF9-C60880FC41B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A49FD39-51EF-42F4-AEF9-C60880FC41B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBB6623D-BDF2-41B6-9165-A22A6C4D4159}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D85F5D9C-A068-4F04-B081-0A3E20CB5D49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{742BE9D1-C925-4B3D-8BCB-BF779B5B7AF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FB84342-2953-4B59-91B8-7BF3AE37172D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FB84342-2953-4B59-91B8-7BF3AE37172D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FB84342-2953-4B59-91B8-7BF3AE37172D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FB84342-2953-4B59-91B8-7BF3AE37172D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80A7F7CE-9235-45CD-A195-E031AB3E1EAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80A7F7CE-9235-45CD-A195-E031AB3E1EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80A7F7CE-9235-45CD-A195-E031AB3E1EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80A7F7CE-9235-45CD-A195-E031AB3E1EAA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A30BBA60-647C-4565-A42F-BE60B2CA2E8E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6DC15D23-8213-4700-9815-AD8DEED1CE5F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B51913C2-478E-46AA-A523-521BD4593651} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{04C5492C-FA54-4F93-8698-44B8BB7C72E0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2CA30CA9-FADA-4AB6-81E3-EAE61EF44463} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{54B5F207-CC11-4AC3-B0D7-1E7A7E2F08DE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6DC919A7-CF8F-4CCD-A7E3-1AD9389FEC86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1C8F67D6-1953-49D3-B716-F298883A79C6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{95C95878-A9CD-43D4-B1BB-D0DCAA54C3D7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E6DAD59F-7CB7-4E70-B4C5-FCCBC3376EDE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3F18D20D-0267-4381-857B-EEDB7B3FC549} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7EAFC2D8-48D2-4A56-A9C6-6BADF2053499} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6C6F323D-054E-4723-9DEA-1C5E1E45DF88} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{DA6A9B7F-F311-49A4-8BBE-42EF3152C37B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{507DB29F-74F5-4B34-A240-ABE7BD168DF6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E4BC1A16-AD0A-4F70-BD2E-3346A4D9BC2B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F05DE950-CA99-42A8-B44D-E7DAA5C3C783} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F011A6F5-BA48-4F8D-A20F-79CCE01CDE0E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{9EDAADA8-B658-430F-97EE-CCA494883D86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B0F53AAA-4ABC-44B2-9331-D3802340DD20} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4050F1D1-1DD2-4B48-A17B-E3F955518C4B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4050F1D1-1DD2-4B48-A17B-E3F90DD18C4B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8CDE71C2-4DA4-4AF6-9897-CD953AE653C2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7B57D5F1-4E6C-4280-AD5B-C71C73B66B11} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D0DF902A-2486-4A38-B7A7-232B9B6590E1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B01E2AE1-1B52-4518-B32E-016070356A7F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{ACF79A18-2655-452C-B4AC-10125F0AD7A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{DBC272A5-C0EE-4FD3-B6F4-EF0C18DF168B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B6F8C99E-5430-4B46-8FCE-7AAAAEBA6A0C}
+		SolutionGuid = {80121011-1A73-45DC-80FC-B3727F3DF58C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
index 566a25fb3b55da..11af7c6455931e 100644
--- a/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
+++ b/src/libraries/System.Reflection.Context/System.Reflection.Context.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context.Tests", "tests\System.Reflection.Context.Tests.csproj", "{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{404DB891-B5AF-41E6-B89D-29E3F4573C4F} = {404DB891-B5AF-41E6-B89D-29E3F4573C4F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{22839FD5-6046-4E0F-9065-A3E5F2A7FEC1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "src\System.Reflection.Context.csproj", "{404DB891-B5AF-41E6-B89D-29E3F4573C4F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C3C70597-F192-430D-9BA6-287B1A974BF7} = {C3C70597-F192-430D-9BA6-287B1A974BF7}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{76EFA804-28A1-4F40-9785-3B29C149CBF9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "ref\System.Reflection.Context.csproj", "{C3C70597-F192-430D-9BA6-287B1A974BF7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "ref\System.Reflection.Context.csproj", "{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context", "src\System.Reflection.Context.csproj", "{794EAE71-36BA-436D-841A-A8C72AADF485}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Context.Tests", "tests\System.Reflection.Context.Tests.csproj", "{34EA59F6-6177-4957-9894-563A73B02D63}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2648D7B5-003A-467A-826A-CDE03B943FB1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{83807DEE-31E5-4DD1-A0A2-6C11520DC727}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E2C4A406-41A9-433F-B90E-37692D466B14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{EDC43690-5101-410E-931F-C327013A5DCF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{41D29D00-79BE-4E07-8D0F-D39B1EF223FC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5D0D840E-77D6-4FD2-963A-BEB27A93D77A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{9901CCEF-7131-432D-AF37-95AA975AA938}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EBE03FDF-924A-4E9B-AA06-632E969460AB}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{22839FD5-6046-4E0F-9065-A3E5F2A7FEC1} = {5D0D840E-77D6-4FD2-963A-BEB27A93D77A}
+		{34EA59F6-6177-4957-9894-563A73B02D63} = {5D0D840E-77D6-4FD2-963A-BEB27A93D77A}
+		{76EFA804-28A1-4F40-9785-3B29C149CBF9} = {9901CCEF-7131-432D-AF37-95AA975AA938}
+		{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67} = {9901CCEF-7131-432D-AF37-95AA975AA938}
+		{2648D7B5-003A-467A-826A-CDE03B943FB1} = {9901CCEF-7131-432D-AF37-95AA975AA938}
+		{EDC43690-5101-410E-931F-C327013A5DCF} = {9901CCEF-7131-432D-AF37-95AA975AA938}
+		{41D29D00-79BE-4E07-8D0F-D39B1EF223FC} = {9901CCEF-7131-432D-AF37-95AA975AA938}
+		{794EAE71-36BA-436D-841A-A8C72AADF485} = {EBE03FDF-924A-4E9B-AA06-632E969460AB}
+		{E2C4A406-41A9-433F-B90E-37692D466B14} = {EBE03FDF-924A-4E9B-AA06-632E969460AB}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{404DB891-B5AF-41E6-B89D-29E3F4573C4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C3C70597-F192-430D-9BA6-287B1A974BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C3C70597-F192-430D-9BA6-287B1A974BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C3C70597-F192-430D-9BA6-287B1A974BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C3C70597-F192-430D-9BA6-287B1A974BF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83807DEE-31E5-4DD1-A0A2-6C11520DC727}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83807DEE-31E5-4DD1-A0A2-6C11520DC727}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83807DEE-31E5-4DD1-A0A2-6C11520DC727}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83807DEE-31E5-4DD1-A0A2-6C11520DC727}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22839FD5-6046-4E0F-9065-A3E5F2A7FEC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22839FD5-6046-4E0F-9065-A3E5F2A7FEC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22839FD5-6046-4E0F-9065-A3E5F2A7FEC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22839FD5-6046-4E0F-9065-A3E5F2A7FEC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76EFA804-28A1-4F40-9785-3B29C149CBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76EFA804-28A1-4F40-9785-3B29C149CBF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76EFA804-28A1-4F40-9785-3B29C149CBF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76EFA804-28A1-4F40-9785-3B29C149CBF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2EBCE83-FA49-4ECD-9E8E-AF231AADFF67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{794EAE71-36BA-436D-841A-A8C72AADF485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{794EAE71-36BA-436D-841A-A8C72AADF485}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{794EAE71-36BA-436D-841A-A8C72AADF485}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{794EAE71-36BA-436D-841A-A8C72AADF485}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34EA59F6-6177-4957-9894-563A73B02D63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34EA59F6-6177-4957-9894-563A73B02D63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34EA59F6-6177-4957-9894-563A73B02D63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34EA59F6-6177-4957-9894-563A73B02D63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2648D7B5-003A-467A-826A-CDE03B943FB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2648D7B5-003A-467A-826A-CDE03B943FB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2648D7B5-003A-467A-826A-CDE03B943FB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2648D7B5-003A-467A-826A-CDE03B943FB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2C4A406-41A9-433F-B90E-37692D466B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2C4A406-41A9-433F-B90E-37692D466B14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2C4A406-41A9-433F-B90E-37692D466B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2C4A406-41A9-433F-B90E-37692D466B14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDC43690-5101-410E-931F-C327013A5DCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDC43690-5101-410E-931F-C327013A5DCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDC43690-5101-410E-931F-C327013A5DCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDC43690-5101-410E-931F-C327013A5DCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41D29D00-79BE-4E07-8D0F-D39B1EF223FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41D29D00-79BE-4E07-8D0F-D39B1EF223FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41D29D00-79BE-4E07-8D0F-D39B1EF223FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41D29D00-79BE-4E07-8D0F-D39B1EF223FC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6183784D-CF12-476F-BA5F-CFAFF1EF1BE3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{404DB891-B5AF-41E6-B89D-29E3F4573C4F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C3C70597-F192-430D-9BA6-287B1A974BF7} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{83807DEE-31E5-4DD1-A0A2-6C11520DC727} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {911E8E3A-B9EC-4005-9298-5CE770137876}
+		SolutionGuid = {BD91D429-58C1-4CA3-A800-E308C697485B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
index a065c13f52404f..dcc977f7bff349 100644
--- a/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
+++ b/src/libraries/System.Reflection.DispatchProxy/System.Reflection.DispatchProxy.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy.Tests", "tests\System.Reflection.DispatchProxy.Tests.csproj", "{089444FE-8FF5-4D8F-A51B-32D026425F6B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1E689C1B-690C-4799-BDE9-6E7990585894} = {1E689C1B-690C-4799-BDE9-6E7990585894}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{84DA6529-43CF-47CE-867A-5D23253D095C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy", "src\System.Reflection.DispatchProxy.csproj", "{1E689C1B-690C-4799-BDE9-6E7990585894}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E} = {7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{EEA05F34-81E2-43EC-ADAD-D3A6DB475033}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy", "ref\System.Reflection.DispatchProxy.csproj", "{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy", "ref\System.Reflection.DispatchProxy.csproj", "{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy", "src\System.Reflection.DispatchProxy.csproj", "{F5A284B5-10D3-43D4-BB3F-F0FB55033504}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.DispatchProxy.Tests", "tests\System.Reflection.DispatchProxy.Tests.csproj", "{64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9B252623-8443-44A7-93B6-F97AFBB520DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CEDCB991-EBD8-4617-B81B-94E73DC50712}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2CDC8069-935D-459D-A2E9-F1EB07C2158C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{257EAF7F-071B-470B-B186-9E6AC8C54061}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2CBF600B-02B8-4EA4-9377-FBFF72476B80}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BF1CD7E8-A1D9-4CEB-8FBE-2FF52099AAA9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D142E961-4463-4349-AC09-E0C4D9B3E31B}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{84DA6529-43CF-47CE-867A-5D23253D095C} = {2CBF600B-02B8-4EA4-9377-FBFF72476B80}
+		{64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6} = {2CBF600B-02B8-4EA4-9377-FBFF72476B80}
+		{EEA05F34-81E2-43EC-ADAD-D3A6DB475033} = {BF1CD7E8-A1D9-4CEB-8FBE-2FF52099AAA9}
+		{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8} = {BF1CD7E8-A1D9-4CEB-8FBE-2FF52099AAA9}
+		{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B} = {BF1CD7E8-A1D9-4CEB-8FBE-2FF52099AAA9}
+		{2CDC8069-935D-459D-A2E9-F1EB07C2158C} = {BF1CD7E8-A1D9-4CEB-8FBE-2FF52099AAA9}
+		{257EAF7F-071B-470B-B186-9E6AC8C54061} = {BF1CD7E8-A1D9-4CEB-8FBE-2FF52099AAA9}
+		{F5A284B5-10D3-43D4-BB3F-F0FB55033504} = {D142E961-4463-4349-AC09-E0C4D9B3E31B}
+		{CEDCB991-EBD8-4617-B81B-94E73DC50712} = {D142E961-4463-4349-AC09-E0C4D9B3E31B}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{089444FE-8FF5-4D8F-A51B-32D026425F6B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{089444FE-8FF5-4D8F-A51B-32D026425F6B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E689C1B-690C-4799-BDE9-6E7990585894}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E689C1B-690C-4799-BDE9-6E7990585894}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B252623-8443-44A7-93B6-F97AFBB520DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B252623-8443-44A7-93B6-F97AFBB520DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B252623-8443-44A7-93B6-F97AFBB520DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B252623-8443-44A7-93B6-F97AFBB520DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84DA6529-43CF-47CE-867A-5D23253D095C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84DA6529-43CF-47CE-867A-5D23253D095C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84DA6529-43CF-47CE-867A-5D23253D095C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84DA6529-43CF-47CE-867A-5D23253D095C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEA05F34-81E2-43EC-ADAD-D3A6DB475033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEA05F34-81E2-43EC-ADAD-D3A6DB475033}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEA05F34-81E2-43EC-ADAD-D3A6DB475033}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EEA05F34-81E2-43EC-ADAD-D3A6DB475033}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE8CF6FB-C4B6-42B4-ADEE-9CE6066DB6D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5A284B5-10D3-43D4-BB3F-F0FB55033504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5A284B5-10D3-43D4-BB3F-F0FB55033504}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5A284B5-10D3-43D4-BB3F-F0FB55033504}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5A284B5-10D3-43D4-BB3F-F0FB55033504}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64DC5B04-1B00-4E98-A0B2-B30FAF43F8A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{627447CE-9FE8-4A29-BC06-D6BBBEC34A8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEDCB991-EBD8-4617-B81B-94E73DC50712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEDCB991-EBD8-4617-B81B-94E73DC50712}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEDCB991-EBD8-4617-B81B-94E73DC50712}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEDCB991-EBD8-4617-B81B-94E73DC50712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CDC8069-935D-459D-A2E9-F1EB07C2158C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CDC8069-935D-459D-A2E9-F1EB07C2158C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CDC8069-935D-459D-A2E9-F1EB07C2158C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CDC8069-935D-459D-A2E9-F1EB07C2158C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{257EAF7F-071B-470B-B186-9E6AC8C54061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{257EAF7F-071B-470B-B186-9E6AC8C54061}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{257EAF7F-071B-470B-B186-9E6AC8C54061}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{257EAF7F-071B-470B-B186-9E6AC8C54061}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{089444FE-8FF5-4D8F-A51B-32D026425F6B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1E689C1B-690C-4799-BDE9-6E7990585894} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7DF3C428-AAD6-41C7-98E6-6CACFD5C391E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9B252623-8443-44A7-93B6-F97AFBB520DD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {ED66E67D-809C-45D7-854C-2D931FCAB32F}
+		SolutionGuid = {32381969-33E3-4DA1-A3DD-82AC1EA2FF9E}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
index 947b31d41a895a..286192f00fe93e 100644
--- a/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
+++ b/src/libraries/System.Reflection.Emit.ILGeneration/System.Reflection.Emit.ILGeneration.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration.Tests", "tests\System.Reflection.Emit.ILGeneration.Tests.csproj", "{FB037640-0591-4DF4-A331-0BEFE50A200B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8F05FFD6-6697-41CA-B733-709F5A6D3BF1} = {8F05FFD6-6697-41CA-B733-709F5A6D3BF1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{B1053D24-237E-4E55-9413-20B34ED79F23}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration", "src\System.Reflection.Emit.ILGeneration.csproj", "{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D8763A34-58C6-4229-AD75-6980EF382294} = {D8763A34-58C6-4229-AD75-6980EF382294}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration", "ref\System.Reflection.Emit.ILGeneration.csproj", "{D8763A34-58C6-4229-AD75-6980EF382294}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration", "ref\System.Reflection.Emit.ILGeneration.csproj", "{64BBA40A-8DB5-4829-815A-3D612A12222D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration", "src\System.Reflection.Emit.ILGeneration.csproj", "{A18E814C-13D6-4859-B6FA-3CAB8673B31F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.ILGeneration.Tests", "tests\System.Reflection.Emit.ILGeneration.Tests.csproj", "{EA6F01DF-1F63-49FF-A6E8-CA9104296196}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9058F57C-0096-4D61-BABF-A6E78855DF06}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{53A1E60F-B7C9-4834-AD16-156058372E57}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{117F6A31-7A07-4A7E-9D69-52329A5152AD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{17102BEF-8E0A-4D2B-8E72-F9AE2B6D0ED9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3DEEFCBA-5912-4DEA-8FCC-9607F1265795}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B60C7D3F-D086-495B-8497-F75E65CE0BF6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B1053D24-237E-4E55-9413-20B34ED79F23} = {17102BEF-8E0A-4D2B-8E72-F9AE2B6D0ED9}
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F} = {17102BEF-8E0A-4D2B-8E72-F9AE2B6D0ED9}
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA} = {17102BEF-8E0A-4D2B-8E72-F9AE2B6D0ED9}
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717} = {3DEEFCBA-5912-4DEA-8FCC-9607F1265795}
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196} = {3DEEFCBA-5912-4DEA-8FCC-9607F1265795}
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C} = {B60C7D3F-D086-495B-8497-F75E65CE0BF6}
+		{64BBA40A-8DB5-4829-815A-3D612A12222D} = {B60C7D3F-D086-495B-8497-F75E65CE0BF6}
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188} = {B60C7D3F-D086-495B-8497-F75E65CE0BF6}
+		{53A1E60F-B7C9-4834-AD16-156058372E57} = {B60C7D3F-D086-495B-8497-F75E65CE0BF6}
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD} = {B60C7D3F-D086-495B-8497-F75E65CE0BF6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB037640-0591-4DF4-A331-0BEFE50A200B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB037640-0591-4DF4-A331-0BEFE50A200B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F05FFD6-6697-41CA-B733-709F5A6D3BF1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8763A34-58C6-4229-AD75-6980EF382294}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8763A34-58C6-4229-AD75-6980EF382294}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9058F57C-0096-4D61-BABF-A6E78855DF06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9058F57C-0096-4D61-BABF-A6E78855DF06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9058F57C-0096-4D61-BABF-A6E78855DF06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9058F57C-0096-4D61-BABF-A6E78855DF06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Debug|Any CPU.Build.0 = Debug|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Debug|x64.ActiveCfg = Debug|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Debug|x64.Build.0 = Debug|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Debug|x86.ActiveCfg = Debug|x86
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Debug|x86.Build.0 = Debug|x86
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Release|Any CPU.ActiveCfg = Release|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Release|Any CPU.Build.0 = Release|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Release|x64.ActiveCfg = Release|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Release|x64.Build.0 = Release|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Release|x86.ActiveCfg = Release|x86
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Release|x86.Build.0 = Release|x86
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Checked|Any CPU.Build.0 = Checked|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Checked|x64.ActiveCfg = Checked|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Checked|x64.Build.0 = Checked|x64
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Checked|x86.ActiveCfg = Checked|x86
+		{B1053D24-237E-4E55-9413-20B34ED79F23}.Checked|x86.Build.0 = Checked|x86
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Debug|x64.Build.0 = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Debug|x86.Build.0 = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Release|x64.ActiveCfg = Release|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Release|x64.Build.0 = Release|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Release|x86.ActiveCfg = Release|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Release|x86.Build.0 = Release|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{05696F45-ACF1-4C02-B8D9-E8C1F5E28717}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Debug|x64.Build.0 = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Debug|x86.Build.0 = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Release|x64.ActiveCfg = Release|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Release|x64.Build.0 = Release|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Release|x86.Build.0 = Release|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9D15C6A3-61DF-4DA6-AF2A-27160AFCC53C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Debug|x64.Build.0 = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Debug|x86.Build.0 = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Release|x64.ActiveCfg = Release|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Release|x64.Build.0 = Release|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Release|x86.ActiveCfg = Release|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Release|x86.Build.0 = Release|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{64BBA40A-8DB5-4829-815A-3D612A12222D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Debug|x64.Build.0 = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Debug|x86.Build.0 = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Release|x64.ActiveCfg = Release|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Release|x64.Build.0 = Release|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Release|x86.ActiveCfg = Release|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Release|x86.Build.0 = Release|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A18E814C-13D6-4859-B6FA-3CAB8673B31F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Release|x64.Build.0 = Release|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Release|x86.Build.0 = Release|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EA6F01DF-1F63-49FF-A6E8-CA9104296196}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x64.Build.0 = Release|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Release|x86.Build.0 = Release|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FA5B6CDF-982C-47F5-95E0-5C1DE3391188}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x64.Build.0 = Release|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Release|x86.Build.0 = Release|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2F96336D-6AB0-4463-9A9F-5ED91E737DEA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Debug|x64.Build.0 = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Debug|x86.Build.0 = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Release|x64.ActiveCfg = Release|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Release|x64.Build.0 = Release|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Release|x86.ActiveCfg = Release|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Release|x86.Build.0 = Release|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{53A1E60F-B7C9-4834-AD16-156058372E57}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Release|x64.Build.0 = Release|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Release|x86.Build.0 = Release|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{117F6A31-7A07-4A7E-9D69-52329A5152AD}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FB037640-0591-4DF4-A331-0BEFE50A200B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8F05FFD6-6697-41CA-B733-709F5A6D3BF1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D8763A34-58C6-4229-AD75-6980EF382294} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9058F57C-0096-4D61-BABF-A6E78855DF06} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DC3F41DA-FEB6-4586-9C99-60961128BD91}
+		SolutionGuid = {248E0825-3C88-4854-B192-C50C9FDDBBC3}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
index 14ebe61301a1a2..a5c9aeaf1bdfb6 100644
--- a/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
+++ b/src/libraries/System.Reflection.Emit.Lightweight/System.Reflection.Emit.Lightweight.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight.Tests", "tests\System.Reflection.Emit.Lightweight.Tests.csproj", "{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9} = {FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{209EDA22-1D20-4180-BE4C-53DEE1758B5D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight", "src\System.Reflection.Emit.Lightweight.csproj", "{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD} = {293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight", "ref\System.Reflection.Emit.Lightweight.csproj", "{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7EA489CB-8675-4E12-8DAD-84235158796E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight", "ref\System.Reflection.Emit.Lightweight.csproj", "{EE535D8F-D21B-4C18-A915-60E94CE19CA2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight", "src\System.Reflection.Emit.Lightweight.csproj", "{BC6947B4-C61B-4066-B75F-937992548E54}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Lightweight.Tests", "tests\System.Reflection.Emit.Lightweight.Tests.csproj", "{13447BAB-2762-4CCC-95DF-531FC82FE39A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DA60AB31-81B1-4485-AFCB-636510762EDD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B21E0098-7443-4475-997B-E6AB3B42E4D6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0285779D-C970-4E27-820E-C204E556DD19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{4C44B452-B225-4259-8725-B38265C3C6DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E0156335-BB44-4CC0-ACD9-9A3EAEB103D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2B3C509C-516F-4F0D-9E85-1D902507A0A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4DD31A18-40B2-4C34-A35E-BA79C0776DF1}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D} = {E0156335-BB44-4CC0-ACD9-9A3EAEB103D9}
+		{BC6947B4-C61B-4066-B75F-937992548E54} = {E0156335-BB44-4CC0-ACD9-9A3EAEB103D9}
+		{0285779D-C970-4E27-820E-C204E556DD19} = {E0156335-BB44-4CC0-ACD9-9A3EAEB103D9}
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A} = {2B3C509C-516F-4F0D-9E85-1D902507A0A2}
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A} = {2B3C509C-516F-4F0D-9E85-1D902507A0A2}
+		{7EA489CB-8675-4E12-8DAD-84235158796E} = {4DD31A18-40B2-4C34-A35E-BA79C0776DF1}
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2} = {4DD31A18-40B2-4C34-A35E-BA79C0776DF1}
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6} = {4DD31A18-40B2-4C34-A35E-BA79C0776DF1}
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9} = {4DD31A18-40B2-4C34-A35E-BA79C0776DF1}
+		{4C44B452-B225-4259-8725-B38265C3C6DC} = {4DD31A18-40B2-4C34-A35E-BA79C0776DF1}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C338DCF7-FB75-407B-A2ED-117FBF3AAA18}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA60AB31-81B1-4485-AFCB-636510762EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA60AB31-81B1-4485-AFCB-636510762EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA60AB31-81B1-4485-AFCB-636510762EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA60AB31-81B1-4485-AFCB-636510762EDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Debug|Any CPU.Build.0 = Debug|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Debug|x64.ActiveCfg = Debug|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Debug|x64.Build.0 = Debug|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Debug|x86.ActiveCfg = Debug|x86
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Debug|x86.Build.0 = Debug|x86
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Release|Any CPU.ActiveCfg = Release|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Release|Any CPU.Build.0 = Release|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Release|x64.ActiveCfg = Release|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Release|x64.Build.0 = Release|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Release|x86.ActiveCfg = Release|x86
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Release|x86.Build.0 = Release|x86
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Checked|Any CPU.Build.0 = Checked|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Checked|x64.ActiveCfg = Checked|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Checked|x64.Build.0 = Checked|x64
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Checked|x86.ActiveCfg = Checked|x86
+		{209EDA22-1D20-4180-BE4C-53DEE1758B5D}.Checked|x86.Build.0 = Checked|x86
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Debug|x64.Build.0 = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Debug|x86.Build.0 = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Release|x64.ActiveCfg = Release|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Release|x64.Build.0 = Release|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Release|x86.Build.0 = Release|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ECDDE645-347C-46D8-B6B6-BCFF6B9AFD4A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Debug|x64.Build.0 = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Release|x64.ActiveCfg = Release|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Release|x64.Build.0 = Release|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Release|x86.Build.0 = Release|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7EA489CB-8675-4E12-8DAD-84235158796E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Debug|x64.Build.0 = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Debug|x86.Build.0 = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Release|x64.ActiveCfg = Release|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Release|x64.Build.0 = Release|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Release|x86.Build.0 = Release|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EE535D8F-D21B-4C18-A915-60E94CE19CA2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Debug|x64.Build.0 = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Debug|x86.Build.0 = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Release|x64.ActiveCfg = Release|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Release|x64.Build.0 = Release|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Release|x86.ActiveCfg = Release|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Release|x86.Build.0 = Release|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BC6947B4-C61B-4066-B75F-937992548E54}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Debug|x64.Build.0 = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Debug|x86.Build.0 = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Release|x64.ActiveCfg = Release|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Release|x64.Build.0 = Release|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Release|x86.ActiveCfg = Release|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Release|x86.Build.0 = Release|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{13447BAB-2762-4CCC-95DF-531FC82FE39A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x64.Build.0 = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Debug|x86.Build.0 = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x64.ActiveCfg = Release|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x64.Build.0 = Release|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x86.ActiveCfg = Release|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Release|x86.Build.0 = Release|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B21E0098-7443-4475-997B-E6AB3B42E4D6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Debug|x64.Build.0 = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Debug|x86.Build.0 = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Release|x64.ActiveCfg = Release|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Release|x64.Build.0 = Release|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Release|x86.ActiveCfg = Release|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Release|x86.Build.0 = Release|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0285779D-C970-4E27-820E-C204E556DD19}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Debug|x64.Build.0 = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Debug|x86.Build.0 = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Release|x64.ActiveCfg = Release|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Release|x64.Build.0 = Release|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Release|x86.ActiveCfg = Release|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Release|x86.Build.0 = Release|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E9EAA4D3-F1A9-4A80-A486-3082F83D6FF9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Release|x64.Build.0 = Release|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Release|x86.Build.0 = Release|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4C44B452-B225-4259-8725-B38265C3C6DC}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C338DCF7-FB75-407B-A2ED-117FBF3AAA18} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{FEF9FF32-8DE5-4C52-BC4E-8725A1FAA1E9} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{293B8D9F-361F-4DED-B95E-3EB2D7C5FBAD} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{DA60AB31-81B1-4485-AFCB-636510762EDD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {897DE0F1-1C3A-4A75-B92F-FBA254166CB3}
+		SolutionGuid = {DC34C129-6D43-4A78-966A-9152BFF226C0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
index ae1afba2e51336..c7b9fee30095e8 100644
--- a/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
+++ b/src/libraries/System.Reflection.Emit/System.Reflection.Emit.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Tests", "tests\System.Reflection.Emit.Tests.csproj", "{1104A263-331A-4CA0-B541-759BD20F7B1D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{19D670F6-6029-43DB-9F43-CB291EB358F4} = {19D670F6-6029-43DB-9F43-CB291EB358F4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{772C93D4-FC45-46AA-B09F-26F01B672EDC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit", "src\System.Reflection.Emit.csproj", "{19D670F6-6029-43DB-9F43-CB291EB358F4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4FBD1556-7B96-414E-9EA4-85281956D60E} = {4FBD1556-7B96-414E-9EA4-85281956D60E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E5543842-139D-43BD-B604-E65EBB91649E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit", "ref\System.Reflection.Emit.csproj", "{4FBD1556-7B96-414E-9EA4-85281956D60E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{55B647B6-D9B9-44F3-9176-83194EEB43CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit", "ref\System.Reflection.Emit.csproj", "{6A176C5B-206D-4550-AC36-0530218E29F5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit", "src\System.Reflection.Emit.csproj", "{B479A4BF-A3A5-4255-A3EF-135015BD877F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Emit.Tests", "tests\System.Reflection.Emit.Tests.csproj", "{82899000-791E-42FF-A594-6DE65DE07C9E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0399E951-BDDE-40B1-9FC8-EE0E5DA78A09}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F4AEC0D3-A456-48CE-A103-175E302187D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C8601778-612D-4274-9F36-17F938E65603}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{11B7459D-B2C4-4AF6-A114-877C0679FDC0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DB073E71-316E-4C4F-A3BE-B731A6D2CE7F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9CA13485-B3C2-4A6D-B369-6E0339ACFD8D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4563E1FA-9565-438F-818F-1BA414C78E80}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC} = {DB073E71-316E-4C4F-A3BE-B731A6D2CE7F}
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F} = {DB073E71-316E-4C4F-A3BE-B731A6D2CE7F}
+		{C8601778-612D-4274-9F36-17F938E65603} = {DB073E71-316E-4C4F-A3BE-B731A6D2CE7F}
+		{E5543842-139D-43BD-B604-E65EBB91649E} = {9CA13485-B3C2-4A6D-B369-6E0339ACFD8D}
+		{82899000-791E-42FF-A594-6DE65DE07C9E} = {9CA13485-B3C2-4A6D-B369-6E0339ACFD8D}
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD} = {4563E1FA-9565-438F-818F-1BA414C78E80}
+		{6A176C5B-206D-4550-AC36-0530218E29F5} = {4563E1FA-9565-438F-818F-1BA414C78E80}
+		{F4AEC0D3-A456-48CE-A103-175E302187D8} = {4563E1FA-9565-438F-818F-1BA414C78E80}
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55} = {4563E1FA-9565-438F-818F-1BA414C78E80}
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0} = {4563E1FA-9565-438F-818F-1BA414C78E80}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1104A263-331A-4CA0-B541-759BD20F7B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1104A263-331A-4CA0-B541-759BD20F7B1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19D670F6-6029-43DB-9F43-CB291EB358F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19D670F6-6029-43DB-9F43-CB291EB358F4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FBD1556-7B96-414E-9EA4-85281956D60E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FBD1556-7B96-414E-9EA4-85281956D60E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0399E951-BDDE-40B1-9FC8-EE0E5DA78A09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0399E951-BDDE-40B1-9FC8-EE0E5DA78A09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0399E951-BDDE-40B1-9FC8-EE0E5DA78A09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0399E951-BDDE-40B1-9FC8-EE0E5DA78A09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Debug|Any CPU.Build.0 = Debug|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Debug|x64.ActiveCfg = Debug|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Debug|x64.Build.0 = Debug|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Debug|x86.ActiveCfg = Debug|x86
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Debug|x86.Build.0 = Debug|x86
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Release|Any CPU.ActiveCfg = Release|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Release|Any CPU.Build.0 = Release|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Release|x64.ActiveCfg = Release|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Release|x64.Build.0 = Release|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Release|x86.ActiveCfg = Release|x86
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Release|x86.Build.0 = Release|x86
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Checked|Any CPU.Build.0 = Checked|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Checked|x64.ActiveCfg = Checked|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Checked|x64.Build.0 = Checked|x64
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Checked|x86.ActiveCfg = Checked|x86
+		{772C93D4-FC45-46AA-B09F-26F01B672EDC}.Checked|x86.Build.0 = Checked|x86
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Release|x64.Build.0 = Release|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Release|x86.Build.0 = Release|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5543842-139D-43BD-B604-E65EBB91649E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Release|x64.Build.0 = Release|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Release|x86.Build.0 = Release|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{55B647B6-D9B9-44F3-9176-83194EEB43CD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Release|x64.Build.0 = Release|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Release|x86.Build.0 = Release|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6A176C5B-206D-4550-AC36-0530218E29F5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Debug|x64.Build.0 = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Debug|x86.Build.0 = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Release|x64.ActiveCfg = Release|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Release|x64.Build.0 = Release|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Release|x86.ActiveCfg = Release|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Release|x86.Build.0 = Release|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B479A4BF-A3A5-4255-A3EF-135015BD877F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Debug|x64.Build.0 = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Debug|x86.Build.0 = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Release|x64.ActiveCfg = Release|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Release|x64.Build.0 = Release|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Release|x86.ActiveCfg = Release|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Release|x86.Build.0 = Release|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82899000-791E-42FF-A594-6DE65DE07C9E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x64.Build.0 = Release|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Release|x86.Build.0 = Release|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F4AEC0D3-A456-48CE-A103-175E302187D8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Debug|x64.Build.0 = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Debug|x86.Build.0 = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Release|x64.ActiveCfg = Release|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Release|x64.Build.0 = Release|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Release|x86.ActiveCfg = Release|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Release|x86.Build.0 = Release|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C8601778-612D-4274-9F36-17F938E65603}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Release|x64.Build.0 = Release|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Release|x86.Build.0 = Release|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE2E0CD3-D1C9-4693-B85D-B3A5E9F37B55}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Release|x64.Build.0 = Release|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Release|x86.Build.0 = Release|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{11B7459D-B2C4-4AF6-A114-877C0679FDC0}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1104A263-331A-4CA0-B541-759BD20F7B1D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{19D670F6-6029-43DB-9F43-CB291EB358F4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4FBD1556-7B96-414E-9EA4-85281956D60E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0399E951-BDDE-40B1-9FC8-EE0E5DA78A09} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4186BAA7-3B41-43E6-8EE0-3F1BEDD2153F}
+		SolutionGuid = {739AA767-154B-4C69-8C9B-C3D332833D92}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
index 7cf23a347c2dec..44fa107202a593 100644
--- a/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
+++ b/src/libraries/System.Reflection.Extensions/System.Reflection.Extensions.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions.Tests", "tests\System.Reflection.Extensions.Tests.csproj", "{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}"
-	ProjectSection(ProjectDependencies) = postProject
-		{26699AB1-DBAC-4819-A1C0-185AB37CF127} = {26699AB1-DBAC-4819-A1C0-185AB37CF127}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{51DFF0B9-72DB-4432-8DBA-551019047723}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions", "src\System.Reflection.Extensions.csproj", "{26699AB1-DBAC-4819-A1C0-185AB37CF127}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72E89A6C-1F60-4170-AB7B-14AAD82E293D} = {72E89A6C-1F60-4170-AB7B-14AAD82E293D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3487F65C-EBD9-4BB9-A51A-5B4F6AE2520D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions", "ref\System.Reflection.Extensions.csproj", "{72E89A6C-1F60-4170-AB7B-14AAD82E293D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions", "ref\System.Reflection.Extensions.csproj", "{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions", "src\System.Reflection.Extensions.csproj", "{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Extensions.Tests", "tests\System.Reflection.Extensions.Tests.csproj", "{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{08A031FF-0E53-4A67-9798-C9E5D48B4A74}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0B9C2467-8461-4AF9-83B1-693D3C154B41}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{432DCBE4-C371-452C-8310-60D84E962154}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{79CA8A5B-E7BB-4A65-9AF7-7F3AE7DC6A6F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{AE211C2F-9943-4E36-804B-8B93A0A1A4C9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{16D489A3-CD82-4834-A0A5-812F7876B5CF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ACD3F2E0-4537-49A8-826E-2FA2D1895C60}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{29593F27-0ABD-4E2F-905A-402B8BCEEBE8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{51DFF0B9-72DB-4432-8DBA-551019047723} = {16D489A3-CD82-4834-A0A5-812F7876B5CF}
+		{1519BE4C-D14A-4741-B9BE-1516CDAE91D9} = {16D489A3-CD82-4834-A0A5-812F7876B5CF}
+		{3487F65C-EBD9-4BB9-A51A-5B4F6AE2520D} = {ACD3F2E0-4537-49A8-826E-2FA2D1895C60}
+		{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B} = {ACD3F2E0-4537-49A8-826E-2FA2D1895C60}
+		{08A031FF-0E53-4A67-9798-C9E5D48B4A74} = {ACD3F2E0-4537-49A8-826E-2FA2D1895C60}
+		{79CA8A5B-E7BB-4A65-9AF7-7F3AE7DC6A6F} = {ACD3F2E0-4537-49A8-826E-2FA2D1895C60}
+		{AE211C2F-9943-4E36-804B-8B93A0A1A4C9} = {ACD3F2E0-4537-49A8-826E-2FA2D1895C60}
+		{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7} = {29593F27-0ABD-4E2F-905A-402B8BCEEBE8}
+		{432DCBE4-C371-452C-8310-60D84E962154} = {29593F27-0ABD-4E2F-905A-402B8BCEEBE8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5E6F8C2-8E71-4148-8806-12FFBDBE2974}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26699AB1-DBAC-4819-A1C0-185AB37CF127}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26699AB1-DBAC-4819-A1C0-185AB37CF127}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72E89A6C-1F60-4170-AB7B-14AAD82E293D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0B9C2467-8461-4AF9-83B1-693D3C154B41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0B9C2467-8461-4AF9-83B1-693D3C154B41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0B9C2467-8461-4AF9-83B1-693D3C154B41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0B9C2467-8461-4AF9-83B1-693D3C154B41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51DFF0B9-72DB-4432-8DBA-551019047723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51DFF0B9-72DB-4432-8DBA-551019047723}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51DFF0B9-72DB-4432-8DBA-551019047723}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51DFF0B9-72DB-4432-8DBA-551019047723}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3487F65C-EBD9-4BB9-A51A-5B4F6AE2520D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3487F65C-EBD9-4BB9-A51A-5B4F6AE2520D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3487F65C-EBD9-4BB9-A51A-5B4F6AE2520D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3487F65C-EBD9-4BB9-A51A-5B4F6AE2520D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5FFC3AB-A8EC-430D-B8C7-35A583D0215B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A71A275-D88D-48FA-B35A-CF27ADCF4EA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1519BE4C-D14A-4741-B9BE-1516CDAE91D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08A031FF-0E53-4A67-9798-C9E5D48B4A74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{432DCBE4-C371-452C-8310-60D84E962154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{432DCBE4-C371-452C-8310-60D84E962154}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{432DCBE4-C371-452C-8310-60D84E962154}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{432DCBE4-C371-452C-8310-60D84E962154}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79CA8A5B-E7BB-4A65-9AF7-7F3AE7DC6A6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79CA8A5B-E7BB-4A65-9AF7-7F3AE7DC6A6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79CA8A5B-E7BB-4A65-9AF7-7F3AE7DC6A6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79CA8A5B-E7BB-4A65-9AF7-7F3AE7DC6A6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE211C2F-9943-4E36-804B-8B93A0A1A4C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE211C2F-9943-4E36-804B-8B93A0A1A4C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE211C2F-9943-4E36-804B-8B93A0A1A4C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE211C2F-9943-4E36-804B-8B93A0A1A4C9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A5E6F8C2-8E71-4148-8806-12FFBDBE2974} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{26699AB1-DBAC-4819-A1C0-185AB37CF127} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{72E89A6C-1F60-4170-AB7B-14AAD82E293D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0B9C2467-8461-4AF9-83B1-693D3C154B41} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FA89C8FE-442C-49BA-80C0-E0EB968BBAE2}
+		SolutionGuid = {DCEC891D-045E-42C6-B041-3CDA580638ED}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
index ca14e0d2744fee..35971fd7edffb4 100644
--- a/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
+++ b/src/libraries/System.Reflection.Metadata/System.Reflection.Metadata.sln
@@ -1,67 +1,93 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.Tests", "tests\System.Reflection.Metadata.Tests.csproj", "{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F3E433C8-352F-4944-BF7F-765CE435370D} = {F3E433C8-352F-4944-BF7F-765CE435370D}
-	EndProjectSection
+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.Reflection.Metadata", "src\System.Reflection.Metadata.csproj", "{F3E433C8-352F-4944-BF7F-765CE435370D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{69B25962-B4C2-4295-8809-5653CD03FC75} = {69B25962-B4C2-4295-8809-5653CD03FC75}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{6FB0D012-27EC-49EB-B41C-A01DDE2937ED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "ref\System.Reflection.Metadata.csproj", "{69B25962-B4C2-4295-8809-5653CD03FC75}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{A69B0EE0-BE0C-4D53-A16F-5465028D975D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "ref\System.Reflection.Metadata.csproj", "{587255BE-DC22-4B85-9E3F-02325E7B4FF7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "src\System.Reflection.Metadata.csproj", "{B905521A-FE25-4D35-9929-B2622F590263}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata.Tests", "tests\System.Reflection.Metadata.Tests.csproj", "{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CCCF36A6-276A-480E-B558-0BEF01ECD74B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{00147002-F430-4E24-95F8-5E79A4D24AE2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{2E24036E-7AFA-4C91-B6B5-BAA919B3BA74}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{632AE256-CA0A-4EBA-8D64-F9988CDC459D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{82DC5DDA-CCFD-4F67-9D15-9BAD27FB4251}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{31FAA062-EF3C-4F4D-AF64-A6130F92A737}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B332ED71-1937-4B24-8519-AE665C23DD2F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C5FDAE2B-91DB-488B-A833-10D7E800447D}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{2231787B-18C9-493C-A102-1E0E6A3D2CD3} = {31FAA062-EF3C-4F4D-AF64-A6130F92A737}
+		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE} = {31FAA062-EF3C-4F4D-AF64-A6130F92A737}
+		{6FB0D012-27EC-49EB-B41C-A01DDE2937ED} = {B332ED71-1937-4B24-8519-AE665C23DD2F}
+		{587255BE-DC22-4B85-9E3F-02325E7B4FF7} = {B332ED71-1937-4B24-8519-AE665C23DD2F}
+		{00147002-F430-4E24-95F8-5E79A4D24AE2} = {B332ED71-1937-4B24-8519-AE665C23DD2F}
+		{632AE256-CA0A-4EBA-8D64-F9988CDC459D} = {B332ED71-1937-4B24-8519-AE665C23DD2F}
+		{82DC5DDA-CCFD-4F67-9D15-9BAD27FB4251} = {B332ED71-1937-4B24-8519-AE665C23DD2F}
+		{A69B0EE0-BE0C-4D53-A16F-5465028D975D} = {C5FDAE2B-91DB-488B-A833-10D7E800447D}
+		{B905521A-FE25-4D35-9929-B2622F590263} = {C5FDAE2B-91DB-488B-A833-10D7E800447D}
+		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE} = {C5FDAE2B-91DB-488B-A833-10D7E800447D}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F3E433C8-352F-4944-BF7F-765CE435370D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F3E433C8-352F-4944-BF7F-765CE435370D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{69B25962-B4C2-4295-8809-5653CD03FC75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69B25962-B4C2-4295-8809-5653CD03FC75}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69B25962-B4C2-4295-8809-5653CD03FC75}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69B25962-B4C2-4295-8809-5653CD03FC75}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CCCF36A6-276A-480E-B558-0BEF01ECD74B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCCF36A6-276A-480E-B558-0BEF01ECD74B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCCF36A6-276A-480E-B558-0BEF01ECD74B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCCF36A6-276A-480E-B558-0BEF01ECD74B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E24036E-7AFA-4C91-B6B5-BAA919B3BA74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E24036E-7AFA-4C91-B6B5-BAA919B3BA74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E24036E-7AFA-4C91-B6B5-BAA919B3BA74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E24036E-7AFA-4C91-B6B5-BAA919B3BA74}.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
+		{2231787B-18C9-493C-A102-1E0E6A3D2CD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FB0D012-27EC-49EB-B41C-A01DDE2937ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FB0D012-27EC-49EB-B41C-A01DDE2937ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FB0D012-27EC-49EB-B41C-A01DDE2937ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FB0D012-27EC-49EB-B41C-A01DDE2937ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A69B0EE0-BE0C-4D53-A16F-5465028D975D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A69B0EE0-BE0C-4D53-A16F-5465028D975D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A69B0EE0-BE0C-4D53-A16F-5465028D975D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A69B0EE0-BE0C-4D53-A16F-5465028D975D}.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
+		{587255BE-DC22-4B85-9E3F-02325E7B4FF7}.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
+		{7EE935DD-2F8B-4C72-BACF-5DB95DE080BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{00147002-F430-4E24-95F8-5E79A4D24AE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00147002-F430-4E24-95F8-5E79A4D24AE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00147002-F430-4E24-95F8-5E79A4D24AE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00147002-F430-4E24-95F8-5E79A4D24AE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E36AB65-74DD-47F5-8F2E-9050561BBFEE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{632AE256-CA0A-4EBA-8D64-F9988CDC459D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{632AE256-CA0A-4EBA-8D64-F9988CDC459D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{632AE256-CA0A-4EBA-8D64-F9988CDC459D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{632AE256-CA0A-4EBA-8D64-F9988CDC459D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82DC5DDA-CCFD-4F67-9D15-9BAD27FB4251}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82DC5DDA-CCFD-4F67-9D15-9BAD27FB4251}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82DC5DDA-CCFD-4F67-9D15-9BAD27FB4251}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82DC5DDA-CCFD-4F67-9D15-9BAD27FB4251}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7061832A-E8CF-4AB6-A8DC-44D2F5A43A13} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F3E433C8-352F-4944-BF7F-765CE435370D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{69B25962-B4C2-4295-8809-5653CD03FC75} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{CCCF36A6-276A-480E-B558-0BEF01ECD74B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2E24036E-7AFA-4C91-B6B5-BAA919B3BA74} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F6593193-C664-402E-987E-54EDBA862D77}
+		SolutionGuid = {64BB97AB-FD23-40BA-B638-FE4756AE6452}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
index c5506d255f7f83..c2802ec317765b 100644
--- a/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
+++ b/src/libraries/System.Reflection.MetadataLoadContext/System.Reflection.MetadataLoadContext.sln
@@ -1,60 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext.Tests", "tests\System.Reflection.MetadataLoadContext.Tests.csproj", "{443B7659-B3FA-4B32-88BA-3A0517E21018}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DBB18588-DD89-4F41-9852-484FD4726F0F} = {DBB18588-DD89-4F41-9852-484FD4726F0F}
-	EndProjectSection
+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.Reflection.MetadataLoadContext", "src\System.Reflection.MetadataLoadContext.csproj", "{DBB18588-DD89-4F41-9852-484FD4726F0F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D} = {EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{006B9B5D-DCC4-442B-ADBD-9FEAEC1487F4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext", "ref\System.Reflection.MetadataLoadContext.csproj", "{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Metadata", "..\System.Reflection.Metadata\src\System.Reflection.Metadata.csproj", "{499E5241-B46A-4161-A27C-C6D599070148}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext", "ref\System.Reflection.MetadataLoadContext.csproj", "{45C9DD05-BD43-49EB-84C3-668200358062}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext", "src\System.Reflection.MetadataLoadContext.csproj", "{DD06D785-53D2-4C11-895C-E9A24E23E276}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{74668CA1-2F2C-4B5C-85DD-15AA365F3B80}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.MetadataLoadContext.Tests", "tests\System.Reflection.MetadataLoadContext.Tests.csproj", "{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{89A190B3-9568-4057-A032-7D28262D51F5}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{59D8B25F-2367-4CC7-9E47-F6EE6FBA16A1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{065DA073-2045-4168-BCE6-7E5B2245D5F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{780EAF31-E4BD-40DE-87C8-588B284C5FB3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0806A916-C13E-4F4A-8900-F3374B9B3B06}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CAFF6330-84DA-4975-BAB1-1389D3E397C3}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{6A69770F-4F95-411F-ACAE-2B902EB62161} = {780EAF31-E4BD-40DE-87C8-588B284C5FB3}
+		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651} = {780EAF31-E4BD-40DE-87C8-588B284C5FB3}
+		{006B9B5D-DCC4-442B-ADBD-9FEAEC1487F4} = {0806A916-C13E-4F4A-8900-F3374B9B3B06}
+		{45C9DD05-BD43-49EB-84C3-668200358062} = {0806A916-C13E-4F4A-8900-F3374B9B3B06}
+		{89A190B3-9568-4057-A032-7D28262D51F5} = {0806A916-C13E-4F4A-8900-F3374B9B3B06}
+		{59D8B25F-2367-4CC7-9E47-F6EE6FBA16A1} = {0806A916-C13E-4F4A-8900-F3374B9B3B06}
+		{065DA073-2045-4168-BCE6-7E5B2245D5F6} = {0806A916-C13E-4F4A-8900-F3374B9B3B06}
+		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C} = {CAFF6330-84DA-4975-BAB1-1389D3E397C3}
+		{499E5241-B46A-4161-A27C-C6D599070148} = {CAFF6330-84DA-4975-BAB1-1389D3E397C3}
+		{DD06D785-53D2-4C11-895C-E9A24E23E276} = {CAFF6330-84DA-4975-BAB1-1389D3E397C3}
+		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619} = {CAFF6330-84DA-4975-BAB1-1389D3E397C3}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{443B7659-B3FA-4B32-88BA-3A0517E21018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{443B7659-B3FA-4B32-88BA-3A0517E21018}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{443B7659-B3FA-4B32-88BA-3A0517E21018}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{443B7659-B3FA-4B32-88BA-3A0517E21018}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBB18588-DD89-4F41-9852-484FD4726F0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBB18588-DD89-4F41-9852-484FD4726F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBB18588-DD89-4F41-9852-484FD4726F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBB18588-DD89-4F41-9852-484FD4726F0F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{74668CA1-2F2C-4B5C-85DD-15AA365F3B80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{74668CA1-2F2C-4B5C-85DD-15AA365F3B80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{74668CA1-2F2C-4B5C-85DD-15AA365F3B80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{74668CA1-2F2C-4B5C-85DD-15AA365F3B80}.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
+		{6A69770F-4F95-411F-ACAE-2B902EB62161}.Release|Any CPU.Build.0 = Release|Any CPU
+		{006B9B5D-DCC4-442B-ADBD-9FEAEC1487F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{006B9B5D-DCC4-442B-ADBD-9FEAEC1487F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{006B9B5D-DCC4-442B-ADBD-9FEAEC1487F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{006B9B5D-DCC4-442B-ADBD-9FEAEC1487F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDDE44A1-86F6-49C5-8DA5-5630C9F1E41C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{499E5241-B46A-4161-A27C-C6D599070148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{499E5241-B46A-4161-A27C-C6D599070148}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{499E5241-B46A-4161-A27C-C6D599070148}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{499E5241-B46A-4161-A27C-C6D599070148}.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
+		{D28B6414-C82C-4BDE-B8BB-A4E3297A0651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{89A190B3-9568-4057-A032-7D28262D51F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5FC4A9B-CBD2-4102-A1E8-60B822AAD619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{59D8B25F-2367-4CC7-9E47-F6EE6FBA16A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59D8B25F-2367-4CC7-9E47-F6EE6FBA16A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59D8B25F-2367-4CC7-9E47-F6EE6FBA16A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59D8B25F-2367-4CC7-9E47-F6EE6FBA16A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{065DA073-2045-4168-BCE6-7E5B2245D5F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{065DA073-2045-4168-BCE6-7E5B2245D5F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{065DA073-2045-4168-BCE6-7E5B2245D5F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{065DA073-2045-4168-BCE6-7E5B2245D5F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{443B7659-B3FA-4B32-88BA-3A0517E21018} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{DBB18588-DD89-4F41-9852-484FD4726F0F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{EC84D608-71BC-4FE4-86C8-CA30F3B0CC7D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{74668CA1-2F2C-4B5C-85DD-15AA365F3B80} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {34BA9CE0-95B8-42D8-B2E1-84D1EB36A8DD}
+		SolutionGuid = {CA7F05F8-4589-46FA-9AC5-4F96F2AE890C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
index 75f81af4ab5d5a..1f755200fcd02b 100644
--- a/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
+++ b/src/libraries/System.Reflection.Primitives/System.Reflection.Primitives.sln
@@ -1,41 +1,85 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitives", "src\System.Reflection.Primitives.csproj", "{CCE47F37-2C51-44EB-8F54-0474D7831515}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F512184F-76E5-4AE5-8AB5-395AF9D18712} = {F512184F-76E5-4AE5-8AB5-395AF9D18712}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{661E0A3D-E151-45B2-AA38-B30F8227A741}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitives", "ref\System.Reflection.Primitives.csproj", "{F512184F-76E5-4AE5-8AB5-395AF9D18712}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitives", "ref\System.Reflection.Primitives.csproj", "{9D308994-9721-4883-B32D-531FA8D9025B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Primitives", "src\System.Reflection.Primitives.csproj", "{5D40069E-7CC2-4B40-A41D-6B003CCB4075}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DE22D9D3-E245-4F9D-9918-470C1B83907B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8A30346B-26E7-4910-B5EE-A4D5220C726B}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{661E0A3D-E151-45B2-AA38-B30F8227A741} = {DE22D9D3-E245-4F9D-9918-470C1B83907B}
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075} = {DE22D9D3-E245-4F9D-9918-470C1B83907B}
+		{9D308994-9721-4883-B32D-531FA8D9025B} = {8A30346B-26E7-4910-B5EE-A4D5220C726B}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCE47F37-2C51-44EB-8F54-0474D7831515}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCE47F37-2C51-44EB-8F54-0474D7831515}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F512184F-76E5-4AE5-8AB5-395AF9D18712}.Release|Any CPU.Build.0 = Release|Any CPU
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Debug|Any CPU.Build.0 = Debug|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Debug|x64.ActiveCfg = Debug|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Debug|x64.Build.0 = Debug|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Debug|x86.ActiveCfg = Debug|x86
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Debug|x86.Build.0 = Debug|x86
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Release|Any CPU.ActiveCfg = Release|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Release|Any CPU.Build.0 = Release|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Release|x64.ActiveCfg = Release|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Release|x64.Build.0 = Release|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Release|x86.ActiveCfg = Release|x86
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Release|x86.Build.0 = Release|x86
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Checked|Any CPU.Build.0 = Checked|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Checked|x64.ActiveCfg = Checked|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Checked|x64.Build.0 = Checked|x64
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Checked|x86.ActiveCfg = Checked|x86
+		{661E0A3D-E151-45B2-AA38-B30F8227A741}.Checked|x86.Build.0 = Checked|x86
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Debug|x64.Build.0 = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Debug|x86.Build.0 = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Release|x64.ActiveCfg = Release|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Release|x64.Build.0 = Release|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Release|x86.Build.0 = Release|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9D308994-9721-4883-B32D-531FA8D9025B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Debug|x64.Build.0 = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Debug|x86.Build.0 = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Release|x64.ActiveCfg = Release|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Release|x64.Build.0 = Release|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Release|x86.ActiveCfg = Release|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Release|x86.Build.0 = Release|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5D40069E-7CC2-4B40-A41D-6B003CCB4075}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CCE47F37-2C51-44EB-8F54-0474D7831515} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F512184F-76E5-4AE5-8AB5-395AF9D18712} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FAA140C7-CD83-4C95-BD5C-39C39660460A}
+		SolutionGuid = {C218B18C-E001-417C-A347-A06C0D5DD6AB}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
index fd5b4d870b7fb2..305bea700e657c 100644
--- a/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
+++ b/src/libraries/System.Reflection.TypeExtensions/System.Reflection.TypeExtensions.sln
@@ -1,70 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions.Tests", "tests\System.Reflection.TypeExtensions.Tests.csproj", "{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB} = {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{F3F9D019-086A-4093-BD49-11B6B204D94A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions.CoreCLR.Tests", "tests\CoreCLR\System.Reflection.TypeExtensions.CoreCLR.Tests.csproj", "{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB} = {A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{41438432-4DC0-4724-8C8F-0D100083490F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions", "src\System.Reflection.TypeExtensions.csproj", "{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C303A051-8D54-4460-8BFD-DE10F0473BDB} = {C303A051-8D54-4460-8BFD-DE10F0473BDB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4593E54A-541B-423F-8666-0A7B3072C3E3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions", "ref\System.Reflection.TypeExtensions.csproj", "{C303A051-8D54-4460-8BFD-DE10F0473BDB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions", "ref\System.Reflection.TypeExtensions.csproj", "{03C0F6B8-A04B-4822-8089-3918F02AD281}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions", "src\System.Reflection.TypeExtensions.csproj", "{B958EACD-B145-4B48-A11B-C5E5B565E311}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TypeExtensions.Tests", "tests\System.Reflection.TypeExtensions.Tests.csproj", "{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A5996CB6-FC83-4352-93A4-6F904D94FEF4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C12B737F-2265-4F48-9BEA-B9023063AC91}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DE5203F1-C29A-4FFA-8037-A9C4B787F9D9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{FD2C9067-B8CE-40C1-BD84-55C6EC52B393}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5E60EC6A-3DC1-4986-867B-352C6ED80933}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{F3F9D019-086A-4093-BD49-11B6B204D94A} = {DE5203F1-C29A-4FFA-8037-A9C4B787F9D9}
+		{B958EACD-B145-4B48-A11B-C5E5B565E311} = {DE5203F1-C29A-4FFA-8037-A9C4B787F9D9}
+		{C12B737F-2265-4F48-9BEA-B9023063AC91} = {DE5203F1-C29A-4FFA-8037-A9C4B787F9D9}
+		{41438432-4DC0-4724-8C8F-0D100083490F} = {FD2C9067-B8CE-40C1-BD84-55C6EC52B393}
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750} = {FD2C9067-B8CE-40C1-BD84-55C6EC52B393}
+		{4593E54A-541B-423F-8666-0A7B3072C3E3} = {5E60EC6A-3DC1-4986-867B-352C6ED80933}
+		{03C0F6B8-A04B-4822-8089-3918F02AD281} = {5E60EC6A-3DC1-4986-867B-352C6ED80933}
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954} = {5E60EC6A-3DC1-4986-867B-352C6ED80933}
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629} = {5E60EC6A-3DC1-4986-867B-352C6ED80933}
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9} = {5E60EC6A-3DC1-4986-867B-352C6ED80933}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BED9F8D5-7420-404E-9EAD-D9148C16EAC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C303A051-8D54-4460-8BFD-DE10F0473BDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5996CB6-FC83-4352-93A4-6F904D94FEF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5996CB6-FC83-4352-93A4-6F904D94FEF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5996CB6-FC83-4352-93A4-6F904D94FEF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5996CB6-FC83-4352-93A4-6F904D94FEF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Debug|Any CPU.Build.0 = Debug|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Debug|x64.ActiveCfg = Debug|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Debug|x64.Build.0 = Debug|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Debug|x86.ActiveCfg = Debug|x86
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Debug|x86.Build.0 = Debug|x86
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Release|Any CPU.ActiveCfg = Release|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Release|Any CPU.Build.0 = Release|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Release|x64.ActiveCfg = Release|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Release|x64.Build.0 = Release|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Release|x86.ActiveCfg = Release|x86
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Release|x86.Build.0 = Release|x86
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Checked|Any CPU.Build.0 = Checked|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Checked|x64.ActiveCfg = Checked|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Checked|x64.Build.0 = Checked|x64
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Checked|x86.ActiveCfg = Checked|x86
+		{F3F9D019-086A-4093-BD49-11B6B204D94A}.Checked|x86.Build.0 = Checked|x86
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Debug|x64.Build.0 = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Debug|x86.Build.0 = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Release|x64.ActiveCfg = Release|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Release|x64.Build.0 = Release|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Release|x86.ActiveCfg = Release|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Release|x86.Build.0 = Release|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{41438432-4DC0-4724-8C8F-0D100083490F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Debug|x86.Build.0 = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Release|x64.Build.0 = Release|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Release|x86.Build.0 = Release|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4593E54A-541B-423F-8666-0A7B3072C3E3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Debug|x64.Build.0 = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Debug|x86.Build.0 = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Release|x64.ActiveCfg = Release|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Release|x64.Build.0 = Release|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Release|x86.ActiveCfg = Release|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Release|x86.Build.0 = Release|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{03C0F6B8-A04B-4822-8089-3918F02AD281}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Debug|x64.Build.0 = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Debug|x86.Build.0 = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Release|x64.ActiveCfg = Release|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Release|x64.Build.0 = Release|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Release|x86.ActiveCfg = Release|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Release|x86.Build.0 = Release|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B958EACD-B145-4B48-A11B-C5E5B565E311}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Debug|x64.Build.0 = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Debug|x86.Build.0 = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Release|x64.ActiveCfg = Release|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Release|x64.Build.0 = Release|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Release|x86.ActiveCfg = Release|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Release|x86.Build.0 = Release|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FEFD49C5-E2A2-411E-ABF4-DE7B58861750}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x64.Build.0 = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Debug|x86.Build.0 = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x64.ActiveCfg = Release|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x64.Build.0 = Release|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x86.ActiveCfg = Release|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Release|x86.Build.0 = Release|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DAC9F70E-E22D-45EE-83DD-1AAEAA234954}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x64.Build.0 = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Debug|x86.Build.0 = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x64.ActiveCfg = Release|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x64.Build.0 = Release|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x86.ActiveCfg = Release|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Release|x86.Build.0 = Release|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C12B737F-2265-4F48-9BEA-B9023063AC91}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Debug|x64.Build.0 = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Debug|x86.Build.0 = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Release|x64.ActiveCfg = Release|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Release|x64.Build.0 = Release|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Release|x86.Build.0 = Release|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6B7AD7F0-9EFE-4BD7-B894-360AC1B7C629}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Debug|x64.Build.0 = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Debug|x86.Build.0 = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Release|x64.ActiveCfg = Release|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Release|x64.Build.0 = Release|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Release|x86.ActiveCfg = Release|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Release|x86.Build.0 = Release|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ABA6BAF4-A229-46E5-9493-E27B9E16DDD9}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EC8FFAA7-CA1E-4631-A375-D54B1FC764F6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BED9F8D5-7420-404E-9EAD-D9148C16EAC1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A9EF5E88-1AD9-4545-8AFE-CA0F5F00E2CB} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C303A051-8D54-4460-8BFD-DE10F0473BDB} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A5996CB6-FC83-4352-93A4-6F904D94FEF4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C367E4AF-ACA6-400F-B583-0F1191136A63}
+		SolutionGuid = {4A98215D-6F1A-4A70-B579-89B7EF7FC92A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Reflection/System.Reflection.sln b/src/libraries/System.Reflection/System.Reflection.sln
index 02bbcbd0d21fb4..4ca98e05f231b3 100644
--- a/src/libraries/System.Reflection/System.Reflection.sln
+++ b/src/libraries/System.Reflection/System.Reflection.sln
@@ -1,220 +1,501 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests", "tests\System.Reflection.Tests.csproj", "{B027C72E-F04E-42E0-A7F7-993AEF8400D2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_0_0_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_0_0_0_0.csproj", "{5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_0_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_0_0_0.csproj", "{80696796-DE63-42CA-ACB0-A83E5AA7AE06}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_0_0.csproj", "{E28C7916-1BCE-434A-B045-9F755A00A7C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_0.csproj", "{0AC47423-D050-46D4-8C4C-E2D44102FAB6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_2", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_2.csproj", "{652B7191-D7FE-4889-8E45-1AF7739C0EAD}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_3", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_3.csproj", "{072D1E70-A0A4-44AB-92B8-2F6B772626CC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_2_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_2_0.csproj", "{3E30213F-6E59-4BE8-BF4A-64D2AAED5B2E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_3_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_3_0.csproj", "{02758899-6A37-4FF1-B765-F1C38B40BC9C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_2_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_2_0_0.csproj", "{510CC907-F5AA-432D-AEEB-14A10AE3F811}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_3_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_3_0_0.csproj", "{68AD3675-F57E-4FB3-9943-49E602678BCA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_3_0_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_3_0_0_0.csproj", "{42E66302-6F46-47BE-936B-4264DFD6004F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.CoreCLR.Tests", "tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj", "{C8049356-559D-4F34-AC17-56F3AE62C897}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForwardedTypesAssembly", "tests\ForwardedTypesAssembly\ForwardedTypesAssembly.csproj", "{FA12CC14-C4A5-495D-B7AA-651E4BCC1027}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAssembly", "tests\TestAssembly\TestAssembly.csproj", "{0CD33916-DD1D-4DF3-B579-2896ACE43E45}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestExe", "tests\TestExe\System.Reflection.TestExe.csproj", "{8C19B991-41E9-4B38-9602-E19375397F1D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnloadableAssembly", "tests\UnloadableAssembly\UnloadableAssembly.csproj", "{7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {68F87E68-E13F-4354-A6D6-B44727FE53EE}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection", "src\System.Reflection.csproj", "{68F87E68-E13F-4354-A6D6-B44727FE53EE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6} = {23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection", "ref\System.Reflection.csproj", "{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{6A967C5A-994E-4C79-8F94-6004758248B5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{27A1A006-6882-4C70-AB81-775D3D2C95A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{226E9496-AD41-4304-A7F5-4465CC6EA28C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection", "ref\System.Reflection.csproj", "{319997BC-5DF6-4E23-A768-ED9905690EF4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection", "src\System.Reflection.csproj", "{2A4650E3-E199-41E4-AD2B-32818E57D1C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_0_0_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_0_0_0_0.csproj", "{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_0_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_0_0_0.csproj", "{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_0_0.csproj", "{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_0.csproj", "{C14AA1F5-6319-4F35-967F-B76E3E7283B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_2", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_2.csproj", "{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_1_3", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_1_3.csproj", "{F0864C35-F7D0-41BD-B7E8-A54630D9537B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_2_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_2_0.csproj", "{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_1_3_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_1_3_0.csproj", "{882B2F3F-31C0-4BB0-8289-AEF4378864B4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_2_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_2_0_0.csproj", "{0082F4DC-2BB1-4119-9678-64CE0315B04D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_1_3_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_1_3_0_0.csproj", "{CFF89A7E-E462-4A34-9352-86C908E0F34C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests.Assembly_3_0_0_0", "tests\AssemblyVersion\System.Reflection.Tests.Assembly_3_0_0_0.csproj", "{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.CoreCLR.Tests", "tests\CoreCLR\System.Reflection.CoreCLR.Tests.csproj", "{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForwardedTypesAssembly", "tests\ForwardedTypesAssembly\ForwardedTypesAssembly.csproj", "{006DEC5A-067B-4099-934E-830ABB10BC26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.Tests", "tests\System.Reflection.Tests.csproj", "{F2E5F428-418B-41B9-BF14-36EB67486A71}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAssembly", "tests\TestAssembly\TestAssembly.csproj", "{E6F16442-FB0F-4666-8309-F8B1EBA5B860}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestExe", "tests\TestExe\System.Reflection.TestExe.csproj", "{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnloadableAssembly", "tests\UnloadableAssembly\UnloadableAssembly.csproj", "{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1030E6C5-CEEF-40BA-AC89-81FB199C0276}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B197B18A-A758-4501-A215-D5C909F39B42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{642A765A-B942-4EA1-BF20-108D3430CCF5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BE0231B1-3CFA-41A4-AB60-C0FF0BC880D7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F97F275-688F-4EAC-A30D-858650B6FECC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{75862F17-5D5D-4B17-8678-F5756F038D4B}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2} = {BE0231B1-3CFA-41A4-AB60-C0FF0BC880D7}
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7} = {BE0231B1-3CFA-41A4-AB60-C0FF0BC880D7}
+		{B197B18A-A758-4501-A215-D5C909F39B42} = {BE0231B1-3CFA-41A4-AB60-C0FF0BC880D7}
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{006DEC5A-067B-4099-934E-830ABB10BC26} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{F2E5F428-418B-41B9-BF14-36EB67486A71} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0} = {3F97F275-688F-4EAC-A30D-858650B6FECC}
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C} = {75862F17-5D5D-4B17-8678-F5756F038D4B}
+		{319997BC-5DF6-4E23-A768-ED9905690EF4} = {75862F17-5D5D-4B17-8678-F5756F038D4B}
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276} = {75862F17-5D5D-4B17-8678-F5756F038D4B}
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305} = {75862F17-5D5D-4B17-8678-F5756F038D4B}
+		{642A765A-B942-4EA1-BF20-108D3430CCF5} = {75862F17-5D5D-4B17-8678-F5756F038D4B}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B027C72E-F04E-42E0-A7F7-993AEF8400D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{80696796-DE63-42CA-ACB0-A83E5AA7AE06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{80696796-DE63-42CA-ACB0-A83E5AA7AE06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{80696796-DE63-42CA-ACB0-A83E5AA7AE06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{80696796-DE63-42CA-ACB0-A83E5AA7AE06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E28C7916-1BCE-434A-B045-9F755A00A7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E28C7916-1BCE-434A-B045-9F755A00A7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E28C7916-1BCE-434A-B045-9F755A00A7C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E28C7916-1BCE-434A-B045-9F755A00A7C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0AC47423-D050-46D4-8C4C-E2D44102FAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0AC47423-D050-46D4-8C4C-E2D44102FAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0AC47423-D050-46D4-8C4C-E2D44102FAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0AC47423-D050-46D4-8C4C-E2D44102FAB6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{652B7191-D7FE-4889-8E45-1AF7739C0EAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{652B7191-D7FE-4889-8E45-1AF7739C0EAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{652B7191-D7FE-4889-8E45-1AF7739C0EAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{652B7191-D7FE-4889-8E45-1AF7739C0EAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{072D1E70-A0A4-44AB-92B8-2F6B772626CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{072D1E70-A0A4-44AB-92B8-2F6B772626CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{072D1E70-A0A4-44AB-92B8-2F6B772626CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{072D1E70-A0A4-44AB-92B8-2F6B772626CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E30213F-6E59-4BE8-BF4A-64D2AAED5B2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E30213F-6E59-4BE8-BF4A-64D2AAED5B2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E30213F-6E59-4BE8-BF4A-64D2AAED5B2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E30213F-6E59-4BE8-BF4A-64D2AAED5B2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02758899-6A37-4FF1-B765-F1C38B40BC9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02758899-6A37-4FF1-B765-F1C38B40BC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02758899-6A37-4FF1-B765-F1C38B40BC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02758899-6A37-4FF1-B765-F1C38B40BC9C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{510CC907-F5AA-432D-AEEB-14A10AE3F811}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{510CC907-F5AA-432D-AEEB-14A10AE3F811}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{510CC907-F5AA-432D-AEEB-14A10AE3F811}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{510CC907-F5AA-432D-AEEB-14A10AE3F811}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68AD3675-F57E-4FB3-9943-49E602678BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68AD3675-F57E-4FB3-9943-49E602678BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68AD3675-F57E-4FB3-9943-49E602678BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68AD3675-F57E-4FB3-9943-49E602678BCA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42E66302-6F46-47BE-936B-4264DFD6004F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42E66302-6F46-47BE-936B-4264DFD6004F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42E66302-6F46-47BE-936B-4264DFD6004F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42E66302-6F46-47BE-936B-4264DFD6004F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C8049356-559D-4F34-AC17-56F3AE62C897}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C8049356-559D-4F34-AC17-56F3AE62C897}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA12CC14-C4A5-495D-B7AA-651E4BCC1027}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0CD33916-DD1D-4DF3-B579-2896ACE43E45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C19B991-41E9-4B38-9602-E19375397F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C19B991-41E9-4B38-9602-E19375397F1D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FFD1B55-D69A-4469-B775-6CBEB1CE50B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A967C5A-994E-4C79-8F94-6004758248B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A967C5A-994E-4C79-8F94-6004758248B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A967C5A-994E-4C79-8F94-6004758248B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A967C5A-994E-4C79-8F94-6004758248B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Debug|Any CPU.Build.0 = Debug|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Debug|x64.ActiveCfg = Debug|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Debug|x64.Build.0 = Debug|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Debug|x86.ActiveCfg = Debug|x86
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Debug|x86.Build.0 = Debug|x86
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Release|Any CPU.ActiveCfg = Release|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Release|Any CPU.Build.0 = Release|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Release|x64.ActiveCfg = Release|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Release|x64.Build.0 = Release|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Release|x86.ActiveCfg = Release|x86
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Release|x86.Build.0 = Release|x86
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Checked|Any CPU.Build.0 = Checked|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Checked|x64.ActiveCfg = Checked|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Checked|x64.Build.0 = Checked|x64
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Checked|x86.ActiveCfg = Checked|x86
+		{27A1A006-6882-4C70-AB81-775D3D2C95A2}.Checked|x86.Build.0 = Checked|x86
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Debug|x64.Build.0 = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Debug|x86.Build.0 = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Release|x64.Build.0 = Release|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Release|x86.ActiveCfg = Release|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Release|x86.Build.0 = Release|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C5A7E7E7-E43B-4C87-9A92-13C3C817E714}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Debug|x64.Build.0 = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Debug|x86.Build.0 = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Release|x64.ActiveCfg = Release|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Release|x64.Build.0 = Release|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Release|x86.ActiveCfg = Release|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Release|x86.Build.0 = Release|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{226E9496-AD41-4304-A7F5-4465CC6EA28C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Debug|x64.Build.0 = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Debug|x86.Build.0 = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Release|x64.ActiveCfg = Release|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Release|x64.Build.0 = Release|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Release|x86.ActiveCfg = Release|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Release|x86.Build.0 = Release|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{319997BC-5DF6-4E23-A768-ED9905690EF4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Debug|x64.Build.0 = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Debug|x86.Build.0 = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Release|x64.ActiveCfg = Release|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Release|x64.Build.0 = Release|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Release|x86.ActiveCfg = Release|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Release|x86.Build.0 = Release|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2A4650E3-E199-41E4-AD2B-32818E57D1C7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Release|x64.Build.0 = Release|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Release|x86.Build.0 = Release|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F5998D9E-69A3-4F43-9AA5-B1BB33B54C64}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Debug|x64.Build.0 = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Debug|x86.Build.0 = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Release|x64.ActiveCfg = Release|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Release|x64.Build.0 = Release|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Release|x86.ActiveCfg = Release|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Release|x86.Build.0 = Release|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7873C6BF-74FA-4DCF-ADCD-15C75B20132D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Release|x64.Build.0 = Release|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Release|x86.Build.0 = Release|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9A5D32AB-91C7-4439-8ACA-4F17252EA3F1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Debug|x64.Build.0 = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Debug|x86.Build.0 = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Release|x64.ActiveCfg = Release|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Release|x64.Build.0 = Release|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Release|x86.ActiveCfg = Release|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Release|x86.Build.0 = Release|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C14AA1F5-6319-4F35-967F-B76E3E7283B0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Release|x64.Build.0 = Release|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Release|x86.Build.0 = Release|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BB496AA6-1841-4A40-A5B5-2DFB7F04CC7A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Debug|x64.Build.0 = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Release|x64.ActiveCfg = Release|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Release|x64.Build.0 = Release|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Release|x86.Build.0 = Release|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F0864C35-F7D0-41BD-B7E8-A54630D9537B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Debug|x64.Build.0 = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Debug|x86.Build.0 = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Release|x64.ActiveCfg = Release|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Release|x64.Build.0 = Release|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Release|x86.ActiveCfg = Release|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Release|x86.Build.0 = Release|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6DACBD8C-A8FF-490D-9434-AB78283C1BDA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Debug|x64.Build.0 = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Debug|x86.Build.0 = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Release|x64.ActiveCfg = Release|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Release|x64.Build.0 = Release|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Release|x86.Build.0 = Release|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{882B2F3F-31C0-4BB0-8289-AEF4378864B4}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Debug|x64.Build.0 = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Debug|x86.Build.0 = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Release|x64.ActiveCfg = Release|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Release|x64.Build.0 = Release|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Release|x86.ActiveCfg = Release|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Release|x86.Build.0 = Release|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0082F4DC-2BB1-4119-9678-64CE0315B04D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Debug|x64.Build.0 = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Debug|x86.Build.0 = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Release|x64.ActiveCfg = Release|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Release|x64.Build.0 = Release|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Release|x86.ActiveCfg = Release|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Release|x86.Build.0 = Release|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CFF89A7E-E462-4A34-9352-86C908E0F34C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Debug|x64.Build.0 = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Debug|x86.Build.0 = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Release|x64.ActiveCfg = Release|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Release|x64.Build.0 = Release|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Release|x86.ActiveCfg = Release|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Release|x86.Build.0 = Release|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F262C9E1-EBC3-4EC2-9CF7-AD266BDD9F58}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Debug|x64.Build.0 = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Debug|x86.Build.0 = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Release|x64.ActiveCfg = Release|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Release|x64.Build.0 = Release|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Release|x86.ActiveCfg = Release|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Release|x86.Build.0 = Release|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CCB3A96A-9DCA-49F1-A1D6-80D0395C1DD3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Debug|x64.Build.0 = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Debug|x86.Build.0 = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Release|x64.ActiveCfg = Release|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Release|x64.Build.0 = Release|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Release|x86.ActiveCfg = Release|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Release|x86.Build.0 = Release|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{006DEC5A-067B-4099-934E-830ABB10BC26}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Debug|x64.Build.0 = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Debug|x86.Build.0 = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Release|x64.ActiveCfg = Release|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Release|x64.Build.0 = Release|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Release|x86.ActiveCfg = Release|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Release|x86.Build.0 = Release|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F2E5F428-418B-41B9-BF14-36EB67486A71}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Debug|x64.Build.0 = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Debug|x86.Build.0 = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Release|x64.ActiveCfg = Release|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Release|x64.Build.0 = Release|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Release|x86.ActiveCfg = Release|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Release|x86.Build.0 = Release|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E6F16442-FB0F-4666-8309-F8B1EBA5B860}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Debug|x64.Build.0 = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Debug|x86.Build.0 = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Release|x64.ActiveCfg = Release|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Release|x64.Build.0 = Release|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Release|x86.ActiveCfg = Release|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Release|x86.Build.0 = Release|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{42BEE4BD-C378-41C5-A94F-4EA01F8D6E88}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Debug|x64.Build.0 = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Debug|x86.Build.0 = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Release|x64.ActiveCfg = Release|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Release|x64.Build.0 = Release|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Release|x86.ActiveCfg = Release|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Release|x86.Build.0 = Release|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C4AF78A8-28D7-434B-8F85-0B0E902AF8E0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x64.Build.0 = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Debug|x86.Build.0 = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x64.ActiveCfg = Release|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x64.Build.0 = Release|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x86.ActiveCfg = Release|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Release|x86.Build.0 = Release|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1030E6C5-CEEF-40BA-AC89-81FB199C0276}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x64.Build.0 = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Debug|x86.Build.0 = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Release|x64.ActiveCfg = Release|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Release|x64.Build.0 = Release|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Release|x86.ActiveCfg = Release|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Release|x86.Build.0 = Release|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B197B18A-A758-4501-A215-D5C909F39B42}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Debug|x64.Build.0 = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Debug|x86.Build.0 = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Release|x64.ActiveCfg = Release|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Release|x64.Build.0 = Release|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Release|x86.ActiveCfg = Release|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Release|x86.Build.0 = Release|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B12B1AFB-D2BD-48D9-B2F7-3E1439E9B305}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Debug|x64.Build.0 = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Debug|x86.Build.0 = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Release|x64.ActiveCfg = Release|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Release|x64.Build.0 = Release|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Release|x86.Build.0 = Release|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{642A765A-B942-4EA1-BF20-108D3430CCF5}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B027C72E-F04E-42E0-A7F7-993AEF8400D2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5B003EB4-DD06-4BC6-B2E9-A9F0E445CB86} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{80696796-DE63-42CA-ACB0-A83E5AA7AE06} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E28C7916-1BCE-434A-B045-9F755A00A7C4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0AC47423-D050-46D4-8C4C-E2D44102FAB6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{652B7191-D7FE-4889-8E45-1AF7739C0EAD} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{072D1E70-A0A4-44AB-92B8-2F6B772626CC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3E30213F-6E59-4BE8-BF4A-64D2AAED5B2E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{02758899-6A37-4FF1-B765-F1C38B40BC9C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{510CC907-F5AA-432D-AEEB-14A10AE3F811} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{68AD3675-F57E-4FB3-9943-49E602678BCA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{42E66302-6F46-47BE-936B-4264DFD6004F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C8049356-559D-4F34-AC17-56F3AE62C897} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{FA12CC14-C4A5-495D-B7AA-651E4BCC1027} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0CD33916-DD1D-4DF3-B579-2896ACE43E45} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8C19B991-41E9-4B38-9602-E19375397F1D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7FFD1B55-D69A-4469-B775-6CBEB1CE50B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{68F87E68-E13F-4354-A6D6-B44727FE53EE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{23B83DCB-45FD-4C8F-A6FB-C6799FB52BA6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{6A967C5A-994E-4C79-8F94-6004758248B5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B5B0C0E5-87B2-4FEB-8411-A1843B24537E}
+		SolutionGuid = {8439AF1D-1B47-4BB3-A6C5-3B34D114C9F3}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
index 643ee9fd0dd887..21784951f053f7 100644
--- a/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
+++ b/src/libraries/System.Resources.Extensions/System.Resources.Extensions.sln
@@ -1,60 +1,121 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions.Tests", "tests\System.Resources.Extensions.Tests.csproj", "{9003846C-EE54-4E58-B01E-6AA177E046C5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6773D354-A573-4D9C-9A67-C7FAE579DA50} = {6773D354-A573-4D9C-9A67-C7FAE579DA50}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{174DC291-4C4A-41D0-B351-8054872AB46A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions", "src\System.Resources.Extensions.csproj", "{6773D354-A573-4D9C-9A67-C7FAE579DA50}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D8C148D2-FAB2-4D8C-ACA3-D201665F7255} = {D8C148D2-FAB2-4D8C-ACA3-D201665F7255}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B4ACFB19-9119-4AAE-A30B-26AEA4AF94C4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions", "ref\System.Resources.Extensions.csproj", "{D8C148D2-FAB2-4D8C-ACA3-D201665F7255}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{FA674D4C-E1D0-45F0-A5AF-D696AA4B1298}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{29B47E47-914A-499D-A5A4-ED8C2BE44834}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{76A32F57-10F9-41A2-BC98-095A063A699C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions", "ref\System.Resources.Extensions.csproj", "{464BD919-594A-4662-B061-D028CB8F3556}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions", "src\System.Resources.Extensions.csproj", "{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Extensions.Tests", "tests\System.Resources.Extensions.Tests.csproj", "{F4A98D66-BA15-4C42-94A9-4732965A969A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{CF497346-A933-4E56-B57F-88067FB122CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{7CDFBBCB-EA56-4FA2-85B6-71D899DF0F39}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{93EB0678-AE79-4C68-BC15-AB09DADA26E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{0174A61A-7E2B-47FC-9CB7-E9EABB898820}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{55F66913-8E94-4522-B50B-4BDB514EBBD9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{38B51762-57C2-4123-9A09-455CA930A995}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8965D959-2906-45B1-A66A-42165A1B42C7}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{174DC291-4C4A-41D0-B351-8054872AB46A} = {55F66913-8E94-4522-B50B-4BDB514EBBD9}
+		{F4A98D66-BA15-4C42-94A9-4732965A969A} = {55F66913-8E94-4522-B50B-4BDB514EBBD9}
+		{B4ACFB19-9119-4AAE-A30B-26AEA4AF94C4} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{FA674D4C-E1D0-45F0-A5AF-D696AA4B1298} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{464BD919-594A-4662-B061-D028CB8F3556} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{7CDFBBCB-EA56-4FA2-85B6-71D899DF0F39} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{93EB0678-AE79-4C68-BC15-AB09DADA26E8} = {38B51762-57C2-4123-9A09-455CA930A995}
+		{29B47E47-914A-499D-A5A4-ED8C2BE44834} = {8965D959-2906-45B1-A66A-42165A1B42C7}
+		{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113} = {8965D959-2906-45B1-A66A-42165A1B42C7}
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5} = {8965D959-2906-45B1-A66A-42165A1B42C7}
+		{CF497346-A933-4E56-B57F-88067FB122CC} = {8965D959-2906-45B1-A66A-42165A1B42C7}
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820} = {8965D959-2906-45B1-A66A-42165A1B42C7}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9003846C-EE54-4E58-B01E-6AA177E046C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9003846C-EE54-4E58-B01E-6AA177E046C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9003846C-EE54-4E58-B01E-6AA177E046C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9003846C-EE54-4E58-B01E-6AA177E046C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6773D354-A573-4D9C-9A67-C7FAE579DA50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6773D354-A573-4D9C-9A67-C7FAE579DA50}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6773D354-A573-4D9C-9A67-C7FAE579DA50}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6773D354-A573-4D9C-9A67-C7FAE579DA50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8C148D2-FAB2-4D8C-ACA3-D201665F7255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8C148D2-FAB2-4D8C-ACA3-D201665F7255}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8C148D2-FAB2-4D8C-ACA3-D201665F7255}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8C148D2-FAB2-4D8C-ACA3-D201665F7255}.Release|Any CPU.Build.0 = Release|Any CPU
-		{76A32F57-10F9-41A2-BC98-095A063A699C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{76A32F57-10F9-41A2-BC98-095A063A699C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{76A32F57-10F9-41A2-BC98-095A063A699C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{76A32F57-10F9-41A2-BC98-095A063A699C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{174DC291-4C4A-41D0-B351-8054872AB46A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4ACFB19-9119-4AAE-A30B-26AEA4AF94C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4ACFB19-9119-4AAE-A30B-26AEA4AF94C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4ACFB19-9119-4AAE-A30B-26AEA4AF94C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4ACFB19-9119-4AAE-A30B-26AEA4AF94C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA674D4C-E1D0-45F0-A5AF-D696AA4B1298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA674D4C-E1D0-45F0-A5AF-D696AA4B1298}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA674D4C-E1D0-45F0-A5AF-D696AA4B1298}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA674D4C-E1D0-45F0-A5AF-D696AA4B1298}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29B47E47-914A-499D-A5A4-ED8C2BE44834}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29B47E47-914A-499D-A5A4-ED8C2BE44834}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29B47E47-914A-499D-A5A4-ED8C2BE44834}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29B47E47-914A-499D-A5A4-ED8C2BE44834}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F07367F-C8D2-4E48-A59E-D4CAF6B40E0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B34DE46-1915-46F7-BD5C-2C8A3B8D1113}.Release|Any CPU.Build.0 = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{464BD919-594A-4662-B061-D028CB8F3556}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F826EEA7-C53C-4C46-8715-D3E9FACB9ED5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4A98D66-BA15-4C42-94A9-4732965A969A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDAF0D88-751E-4FA1-BBDC-C7297ADF7AAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF497346-A933-4E56-B57F-88067FB122CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF497346-A933-4E56-B57F-88067FB122CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF497346-A933-4E56-B57F-88067FB122CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF497346-A933-4E56-B57F-88067FB122CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7CDFBBCB-EA56-4FA2-85B6-71D899DF0F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7CDFBBCB-EA56-4FA2-85B6-71D899DF0F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7CDFBBCB-EA56-4FA2-85B6-71D899DF0F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7CDFBBCB-EA56-4FA2-85B6-71D899DF0F39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93EB0678-AE79-4C68-BC15-AB09DADA26E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93EB0678-AE79-4C68-BC15-AB09DADA26E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93EB0678-AE79-4C68-BC15-AB09DADA26E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93EB0678-AE79-4C68-BC15-AB09DADA26E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0174A61A-7E2B-47FC-9CB7-E9EABB898820}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9003846C-EE54-4E58-B01E-6AA177E046C5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6773D354-A573-4D9C-9A67-C7FAE579DA50} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D8C148D2-FAB2-4D8C-ACA3-D201665F7255} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{76A32F57-10F9-41A2-BC98-095A063A699C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {046617DD-67EB-43A1-BE4E-22CCFC3EC15F}
+		SolutionGuid = {E201426B-999F-48A5-BCFD-3E757AA0E182}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
index a5274da686af76..e72c47f1b7950a 100644
--- a/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
+++ b/src/libraries/System.Resources.Reader/System.Resources.Reader.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader.Tests", "tests\System.Resources.Reader.Tests.csproj", "{8D7202E8-084A-4C20-AB93-3BF70D2E0651}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5C13260D-C55D-46AF-9DCB-1B015D48E2E4} = {5C13260D-C55D-46AF-9DCB-1B015D48E2E4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8116E964-9FFB-4D28-A9C4-33E1A1A74747}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader", "src\System.Resources.Reader.csproj", "{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{99A66A70-7055-48FC-9BE1-36ED2B392E0D} = {99A66A70-7055-48FC-9BE1-36ED2B392E0D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{C79983AB-9E6C-4511-BC1C-95FD04172F7F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader", "ref\System.Resources.Reader.csproj", "{99A66A70-7055-48FC-9BE1-36ED2B392E0D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader", "ref\System.Resources.Reader.csproj", "{07F0592A-7158-43AA-9196-135EBF555394}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader", "src\System.Resources.Reader.csproj", "{037437D0-39B7-4086-8549-B3DFE0F37576}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Reader.Tests", "tests\System.Resources.Reader.Tests.csproj", "{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{214B6B33-5AAE-4CBC-8066-1360B0137915}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5BAD6FCC-348D-4F02-BD0D-2463DC175944}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{91E36AA2-46B7-4E34-93CD-AC7EB7319A0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{C278F65F-28B4-48FD-910F-D22122780BAE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{11194C27-BE66-47E6-8272-C56CD2542A07}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{91134050-8B79-48E7-8B88-21C41A69B264}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5E19A5F0-B780-4E08-BEF6-E3234F767793}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8116E964-9FFB-4D28-A9C4-33E1A1A74747} = {11194C27-BE66-47E6-8272-C56CD2542A07}
+		{AF1E79F5-F489-4370-85DA-A7FBB173B2E4} = {11194C27-BE66-47E6-8272-C56CD2542A07}
+		{C79983AB-9E6C-4511-BC1C-95FD04172F7F} = {91134050-8B79-48E7-8B88-21C41A69B264}
+		{07F0592A-7158-43AA-9196-135EBF555394} = {91134050-8B79-48E7-8B88-21C41A69B264}
+		{214B6B33-5AAE-4CBC-8066-1360B0137915} = {91134050-8B79-48E7-8B88-21C41A69B264}
+		{91E36AA2-46B7-4E34-93CD-AC7EB7319A0E} = {91134050-8B79-48E7-8B88-21C41A69B264}
+		{C278F65F-28B4-48FD-910F-D22122780BAE} = {91134050-8B79-48E7-8B88-21C41A69B264}
+		{037437D0-39B7-4086-8549-B3DFE0F37576} = {5E19A5F0-B780-4E08-BEF6-E3234F767793}
+		{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5} = {5E19A5F0-B780-4E08-BEF6-E3234F767793}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D7202E8-084A-4C20-AB93-3BF70D2E0651}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5C13260D-C55D-46AF-9DCB-1B015D48E2E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99A66A70-7055-48FC-9BE1-36ED2B392E0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BAD6FCC-348D-4F02-BD0D-2463DC175944}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BAD6FCC-348D-4F02-BD0D-2463DC175944}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BAD6FCC-348D-4F02-BD0D-2463DC175944}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BAD6FCC-348D-4F02-BD0D-2463DC175944}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8116E964-9FFB-4D28-A9C4-33E1A1A74747}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8116E964-9FFB-4D28-A9C4-33E1A1A74747}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8116E964-9FFB-4D28-A9C4-33E1A1A74747}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8116E964-9FFB-4D28-A9C4-33E1A1A74747}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C79983AB-9E6C-4511-BC1C-95FD04172F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C79983AB-9E6C-4511-BC1C-95FD04172F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C79983AB-9E6C-4511-BC1C-95FD04172F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C79983AB-9E6C-4511-BC1C-95FD04172F7F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07F0592A-7158-43AA-9196-135EBF555394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07F0592A-7158-43AA-9196-135EBF555394}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07F0592A-7158-43AA-9196-135EBF555394}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07F0592A-7158-43AA-9196-135EBF555394}.Release|Any CPU.Build.0 = Release|Any CPU
+		{037437D0-39B7-4086-8549-B3DFE0F37576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{037437D0-39B7-4086-8549-B3DFE0F37576}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{037437D0-39B7-4086-8549-B3DFE0F37576}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{037437D0-39B7-4086-8549-B3DFE0F37576}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF1E79F5-F489-4370-85DA-A7FBB173B2E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{214B6B33-5AAE-4CBC-8066-1360B0137915}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{214B6B33-5AAE-4CBC-8066-1360B0137915}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{214B6B33-5AAE-4CBC-8066-1360B0137915}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{214B6B33-5AAE-4CBC-8066-1360B0137915}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BAEC9D9-DDB8-4FD4-86BD-D144BBAA09F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91E36AA2-46B7-4E34-93CD-AC7EB7319A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91E36AA2-46B7-4E34-93CD-AC7EB7319A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91E36AA2-46B7-4E34-93CD-AC7EB7319A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91E36AA2-46B7-4E34-93CD-AC7EB7319A0E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C278F65F-28B4-48FD-910F-D22122780BAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C278F65F-28B4-48FD-910F-D22122780BAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C278F65F-28B4-48FD-910F-D22122780BAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C278F65F-28B4-48FD-910F-D22122780BAE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8D7202E8-084A-4C20-AB93-3BF70D2E0651} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{5C13260D-C55D-46AF-9DCB-1B015D48E2E4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{99A66A70-7055-48FC-9BE1-36ED2B392E0D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{5BAD6FCC-348D-4F02-BD0D-2463DC175944} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C8AC6D31-F003-429B-A606-3F8B96C82DEE}
+		SolutionGuid = {5B8632D5-A756-4119-A8BF-B3F69CB7A260}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
index 9806bd559cc586..49634bfcf0c7d3 100644
--- a/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
+++ b/src/libraries/System.Resources.ResourceManager/System.Resources.ResourceManager.sln
@@ -1,60 +1,267 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager.Tests", "tests\System.Resources.ResourceManager.Tests.csproj", "{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3E7810B2-2802-4867-B223-30427F3F2D5B} = {3E7810B2-2802-4867-B223-30427F3F2D5B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{152966B3-6D3D-4318-B62D-224940A6B746}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager", "src\System.Resources.ResourceManager.csproj", "{3E7810B2-2802-4867-B223-30427F3F2D5B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{97CFE337-C57E-4B2E-B495-65B917E1282E} = {97CFE337-C57E-4B2E-B495-65B917E1282E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B93B5C05-FB28-4173-8786-57B42CFE38F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager", "ref\System.Resources.ResourceManager.csproj", "{97CFE337-C57E-4B2E-B495-65B917E1282E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{7A7EB655-E233-4824-BE13-34693F452D1E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{00F48AD2-CCF6-4F52-A63E-AC2D00574375}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DB4C5D88-2441-4C1F-9957-CD23BB4E43E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager", "ref\System.Resources.ResourceManager.csproj", "{16C50BBF-58E6-46B0-99EC-89927A65557B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager", "src\System.Resources.ResourceManager.csproj", "{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.ResourceManager.Tests", "tests\System.Resources.ResourceManager.Tests.csproj", "{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FD2E1F63-7B03-4220-8A94-262A11878B54}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C411D7D4-7F9C-437E-A36D-022D30389B65}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{16CF3ECD-F623-4E57-8B45-8B347E663360}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{9EB8EE1D-BBF7-4E6A-92DF-7A82550754DA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{643E62DC-80DA-4EC8-AB36-47A3B080C76C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{152966B3-6D3D-4318-B62D-224940A6B746} = {16CF3ECD-F623-4E57-8B45-8B347E663360}
+		{7A7EB655-E233-4824-BE13-34693F452D1E} = {16CF3ECD-F623-4E57-8B45-8B347E663360}
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375} = {16CF3ECD-F623-4E57-8B45-8B347E663360}
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF} = {16CF3ECD-F623-4E57-8B45-8B347E663360}
+		{C411D7D4-7F9C-437E-A36D-022D30389B65} = {16CF3ECD-F623-4E57-8B45-8B347E663360}
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3} = {9EB8EE1D-BBF7-4E6A-92DF-7A82550754DA}
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424} = {9EB8EE1D-BBF7-4E6A-92DF-7A82550754DA}
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0} = {643E62DC-80DA-4EC8-AB36-47A3B080C76C}
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B} = {643E62DC-80DA-4EC8-AB36-47A3B080C76C}
+		{16C50BBF-58E6-46B0-99EC-89927A65557B} = {643E62DC-80DA-4EC8-AB36-47A3B080C76C}
+		{FD2E1F63-7B03-4220-8A94-262A11878B54} = {643E62DC-80DA-4EC8-AB36-47A3B080C76C}
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3} = {643E62DC-80DA-4EC8-AB36-47A3B080C76C}
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978} = {643E62DC-80DA-4EC8-AB36-47A3B080C76C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E7810B2-2802-4867-B223-30427F3F2D5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E7810B2-2802-4867-B223-30427F3F2D5B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97CFE337-C57E-4B2E-B495-65B917E1282E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97CFE337-C57E-4B2E-B495-65B917E1282E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB4C5D88-2441-4C1F-9957-CD23BB4E43E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB4C5D88-2441-4C1F-9957-CD23BB4E43E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB4C5D88-2441-4C1F-9957-CD23BB4E43E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB4C5D88-2441-4C1F-9957-CD23BB4E43E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Debug|Any CPU.Build.0 = Debug|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Debug|x64.ActiveCfg = Debug|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Debug|x64.Build.0 = Debug|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Debug|x86.ActiveCfg = Debug|x86
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Debug|x86.Build.0 = Debug|x86
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Release|Any CPU.ActiveCfg = Release|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Release|Any CPU.Build.0 = Release|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Release|x64.ActiveCfg = Release|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Release|x64.Build.0 = Release|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Release|x86.ActiveCfg = Release|x86
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Release|x86.Build.0 = Release|x86
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Checked|Any CPU.Build.0 = Checked|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Checked|x64.ActiveCfg = Checked|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Checked|x64.Build.0 = Checked|x64
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Checked|x86.ActiveCfg = Checked|x86
+		{152966B3-6D3D-4318-B62D-224940A6B746}.Checked|x86.Build.0 = Checked|x86
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Release|x64.Build.0 = Release|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Release|x86.Build.0 = Release|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B93B5C05-FB28-4173-8786-57B42CFE38F3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Debug|x64.Build.0 = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Debug|x86.Build.0 = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Release|x64.ActiveCfg = Release|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Release|x64.Build.0 = Release|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Release|x86.ActiveCfg = Release|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Release|x86.Build.0 = Release|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A523F56C-3070-4FA4-A23A-0549FF3B7EC0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Release|x64.Build.0 = Release|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Release|x86.Build.0 = Release|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AFC17385-4DE6-40FF-AEF9-F117B0F1C00B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Debug|x64.Build.0 = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Debug|x86.Build.0 = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Release|x64.ActiveCfg = Release|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Release|x64.Build.0 = Release|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Release|x86.ActiveCfg = Release|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Release|x86.Build.0 = Release|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7A7EB655-E233-4824-BE13-34693F452D1E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Debug|x64.Build.0 = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Debug|x86.Build.0 = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Release|x64.ActiveCfg = Release|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Release|x64.Build.0 = Release|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Release|x86.ActiveCfg = Release|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Release|x86.Build.0 = Release|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{00F48AD2-CCF6-4F52-A63E-AC2D00574375}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Debug|x64.Build.0 = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Debug|x86.Build.0 = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Release|x64.ActiveCfg = Release|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Release|x64.Build.0 = Release|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Release|x86.ActiveCfg = Release|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Release|x86.Build.0 = Release|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{16C50BBF-58E6-46B0-99EC-89927A65557B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Debug|x86.Build.0 = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Release|x64.Build.0 = Release|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Release|x86.Build.0 = Release|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5C0A720D-EF35-4403-B246-89AFBFC6C7AF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Debug|x64.Build.0 = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Debug|x86.Build.0 = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Release|x64.ActiveCfg = Release|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Release|x64.Build.0 = Release|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Release|x86.ActiveCfg = Release|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Release|x86.Build.0 = Release|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DE363A06-8C3D-4DDA-AD67-3B6C253E0424}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x64.Build.0 = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Debug|x86.Build.0 = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x64.ActiveCfg = Release|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x64.Build.0 = Release|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x86.ActiveCfg = Release|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Release|x86.Build.0 = Release|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FD2E1F63-7B03-4220-8A94-262A11878B54}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x64.Build.0 = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Debug|x86.Build.0 = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x64.ActiveCfg = Release|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x64.Build.0 = Release|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x86.ActiveCfg = Release|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Release|x86.Build.0 = Release|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C411D7D4-7F9C-437E-A36D-022D30389B65}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Debug|x64.Build.0 = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Debug|x86.Build.0 = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Release|x64.ActiveCfg = Release|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Release|x64.Build.0 = Release|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Release|x86.ActiveCfg = Release|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Release|x86.Build.0 = Release|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3ADF14C8-EE04-4353-9DAC-49C5D13C7CC3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Debug|x64.Build.0 = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Debug|x86.Build.0 = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Release|x64.ActiveCfg = Release|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Release|x64.Build.0 = Release|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Release|x86.ActiveCfg = Release|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Release|x86.Build.0 = Release|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CEC60C4B-43AC-403A-A36A-0A5F1FB08978}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1D51A16C-B6D8-4E8F-98DE-21AD9A7062A1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3E7810B2-2802-4867-B223-30427F3F2D5B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{97CFE337-C57E-4B2E-B495-65B917E1282E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{DB4C5D88-2441-4C1F-9957-CD23BB4E43E7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BEA182FA-BE6A-494A-AE4F-320BB016A4ED}
+		SolutionGuid = {76F63057-5429-4500-BF4F-16E66362192D}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
index 79f1a63537826a..cdf636883b6331 100644
--- a/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
+++ b/src/libraries/System.Resources.Writer/System.Resources.Writer.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer.Tests", "tests\System.Resources.Writer.Tests.csproj", "{EFA745C2-3741-4D54-B2A1-1979E43354E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6} = {98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A665E615-45ED-42F9-877A-80353A636779}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer", "src\System.Resources.Writer.csproj", "{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3} = {7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{F90791D3-E647-43AA-A0FC-EA73B7E43F33}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer", "ref\System.Resources.Writer.csproj", "{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer", "ref\System.Resources.Writer.csproj", "{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer", "src\System.Resources.Writer.csproj", "{1C001837-6F9D-4C5A-94B4-4388225C34B5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Resources.Writer.Tests", "tests\System.Resources.Writer.Tests.csproj", "{2E27487F-36D6-42E9-BA91-F511686122E7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D33748D9-5F99-4D8A-81C8-B530F264500B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C71EBA4D-EB61-49BD-9E95-F7A8675069E8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{003D6220-3094-4915-BE2D-A4C1671CB64D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BF6C143D-91AB-4F92-AF0E-171343A85632}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{98D69B91-A867-498F-950E-A3B068703A0F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{18A5A8ED-82B9-4E5E-8483-E45EE5BDA7A7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{51B6D5DF-01A8-4402-A8C9-90A37FB19D24}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97920E64-FFB2-4A8D-9161-30BDA611D129}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A665E615-45ED-42F9-877A-80353A636779} = {18A5A8ED-82B9-4E5E-8483-E45EE5BDA7A7}
+		{2E27487F-36D6-42E9-BA91-F511686122E7} = {18A5A8ED-82B9-4E5E-8483-E45EE5BDA7A7}
+		{F90791D3-E647-43AA-A0FC-EA73B7E43F33} = {51B6D5DF-01A8-4402-A8C9-90A37FB19D24}
+		{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9} = {51B6D5DF-01A8-4402-A8C9-90A37FB19D24}
+		{D33748D9-5F99-4D8A-81C8-B530F264500B} = {51B6D5DF-01A8-4402-A8C9-90A37FB19D24}
+		{BF6C143D-91AB-4F92-AF0E-171343A85632} = {51B6D5DF-01A8-4402-A8C9-90A37FB19D24}
+		{98D69B91-A867-498F-950E-A3B068703A0F} = {51B6D5DF-01A8-4402-A8C9-90A37FB19D24}
+		{1C001837-6F9D-4C5A-94B4-4388225C34B5} = {97920E64-FFB2-4A8D-9161-30BDA611D129}
+		{003D6220-3094-4915-BE2D-A4C1671CB64D} = {97920E64-FFB2-4A8D-9161-30BDA611D129}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EFA745C2-3741-4D54-B2A1-1979E43354E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EFA745C2-3741-4D54-B2A1-1979E43354E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EFA745C2-3741-4D54-B2A1-1979E43354E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EFA745C2-3741-4D54-B2A1-1979E43354E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C71EBA4D-EB61-49BD-9E95-F7A8675069E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C71EBA4D-EB61-49BD-9E95-F7A8675069E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C71EBA4D-EB61-49BD-9E95-F7A8675069E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C71EBA4D-EB61-49BD-9E95-F7A8675069E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A665E615-45ED-42F9-877A-80353A636779}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A665E615-45ED-42F9-877A-80353A636779}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A665E615-45ED-42F9-877A-80353A636779}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A665E615-45ED-42F9-877A-80353A636779}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F90791D3-E647-43AA-A0FC-EA73B7E43F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F90791D3-E647-43AA-A0FC-EA73B7E43F33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F90791D3-E647-43AA-A0FC-EA73B7E43F33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F90791D3-E647-43AA-A0FC-EA73B7E43F33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DF70E82A-3986-4E74-BF85-7CB4B0A6DED9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C001837-6F9D-4C5A-94B4-4388225C34B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C001837-6F9D-4C5A-94B4-4388225C34B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C001837-6F9D-4C5A-94B4-4388225C34B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C001837-6F9D-4C5A-94B4-4388225C34B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E27487F-36D6-42E9-BA91-F511686122E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E27487F-36D6-42E9-BA91-F511686122E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E27487F-36D6-42E9-BA91-F511686122E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E27487F-36D6-42E9-BA91-F511686122E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D33748D9-5F99-4D8A-81C8-B530F264500B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D33748D9-5F99-4D8A-81C8-B530F264500B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D33748D9-5F99-4D8A-81C8-B530F264500B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D33748D9-5F99-4D8A-81C8-B530F264500B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{003D6220-3094-4915-BE2D-A4C1671CB64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{003D6220-3094-4915-BE2D-A4C1671CB64D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{003D6220-3094-4915-BE2D-A4C1671CB64D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{003D6220-3094-4915-BE2D-A4C1671CB64D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF6C143D-91AB-4F92-AF0E-171343A85632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF6C143D-91AB-4F92-AF0E-171343A85632}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF6C143D-91AB-4F92-AF0E-171343A85632}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF6C143D-91AB-4F92-AF0E-171343A85632}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98D69B91-A867-498F-950E-A3B068703A0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98D69B91-A867-498F-950E-A3B068703A0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98D69B91-A867-498F-950E-A3B068703A0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98D69B91-A867-498F-950E-A3B068703A0F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EFA745C2-3741-4D54-B2A1-1979E43354E4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{98CA9A7F-AD5C-418B-BC22-735AC2BE21A6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7A1466AF-8BBA-4CB5-8D98-1DFE06853ED3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C71EBA4D-EB61-49BD-9E95-F7A8675069E8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2274396F-3F3B-4B08-8F48-D226627245AF}
+		SolutionGuid = {C1D84753-65B5-4B60-A555-3507CD4FDAB2}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
index 798404026e42a3..a038fe2e2e04db 100644
--- a/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
+++ b/src/libraries/System.Runtime.Caching/System.Runtime.Caching.sln
@@ -1,60 +1,163 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching.Tests", "tests\System.Runtime.Caching.Tests.csproj", "{397E49A7-EB26-4368-8F46-D78B98F4A971}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829} = {A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching", "src\System.Runtime.Caching.csproj", "{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280} = {3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{5370955B-9226-4EBD-A56A-FC323A5C1B60}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching", "ref\System.Runtime.Caching.csproj", "{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{4607440C-7237-4077-ACAB-E0910673B162}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching", "ref\System.Runtime.Caching.csproj", "{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{57836C98-D90B-4D78-9203-B6DB2C8098DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching", "src\System.Runtime.Caching.csproj", "{6311C025-F6D3-43A0-A9DA-A58AA6602568}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Caching.Tests", "tests\System.Runtime.Caching.Tests.csproj", "{AA05074D-88AF-482E-A44A-F1AC13494E9F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{1C015082-C690-46C1-B9BF-6FB4EA25ACFC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{32D8600C-3134-48EF-BDC6-AEC26064EFEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{97AA55FE-40A9-4084-AA08-D178FEFB18AF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{986272FB-E5C6-4881-9867-DC3427D883AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{AFBFBBE6-F5EC-4889-9F34-03E07562630D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{45E0A981-A131-4147-94E7-49AAC45F5D14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{6F55B699-FA9A-4B4E-BAB1-DD288465D9E8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{8D3AC7A1-5C3F-43A8-8C7F-FB441BE1A875}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{A154C9F1-845A-4596-9061-92C462E971A6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB01F45-7885-4F35-9A64-5D134339401C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{77DCC3DE-3A42-4D8E-806D-905FD30B73CF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748} = {0AB01F45-7885-4F35-9A64-5D134339401C}
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F} = {0AB01F45-7885-4F35-9A64-5D134339401C}
+		{5370955B-9226-4EBD-A56A-FC323A5C1B60} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{4607440C-7237-4077-ACAB-E0910673B162} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{1C015082-C690-46C1-B9BF-6FB4EA25ACFC} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{32D8600C-3134-48EF-BDC6-AEC26064EFEB} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{986272FB-E5C6-4881-9867-DC3427D883AE} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{45E0A981-A131-4147-94E7-49AAC45F5D14} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{6F55B699-FA9A-4B4E-BAB1-DD288465D9E8} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{A154C9F1-845A-4596-9061-92C462E971A6} = {77DCC3DE-3A42-4D8E-806D-905FD30B73CF}
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{97AA55FE-40A9-4084-AA08-D178FEFB18AF} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{8D3AC7A1-5C3F-43A8-8C7F-FB441BE1A875} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028} = {F2604DF5-C8C5-4292-BF51-F1F5AF66DDE5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{397E49A7-EB26-4368-8F46-D78B98F4A971}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{397E49A7-EB26-4368-8F46-D78B98F4A971}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{397E49A7-EB26-4368-8F46-D78B98F4A971}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{397E49A7-EB26-4368-8F46-D78B98F4A971}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57836C98-D90B-4D78-9203-B6DB2C8098DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57836C98-D90B-4D78-9203-B6DB2C8098DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{57836C98-D90B-4D78-9203-B6DB2C8098DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{57836C98-D90B-4D78-9203-B6DB2C8098DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DD7C7A6-6F4C-497B-A836-20F2D4F66748}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5370955B-9226-4EBD-A56A-FC323A5C1B60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5370955B-9226-4EBD-A56A-FC323A5C1B60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5370955B-9226-4EBD-A56A-FC323A5C1B60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5370955B-9226-4EBD-A56A-FC323A5C1B60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2CB0E92-8F52-49A3-A2CA-9F77C8ED4A6D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AC9B23C-C788-4607-86EB-E7F66F14AFDB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4607440C-7237-4077-ACAB-E0910673B162}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4607440C-7237-4077-ACAB-E0910673B162}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4607440C-7237-4077-ACAB-E0910673B162}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4607440C-7237-4077-ACAB-E0910673B162}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8D8A7D0-EAE7-4D04-97CA-7B14DA9D0BD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6311C025-F6D3-43A0-A9DA-A58AA6602568}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA05074D-88AF-482E-A44A-F1AC13494E9F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C015082-C690-46C1-B9BF-6FB4EA25ACFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2A8BC2C-6B07-4D2A-BD60-6F1D10902AC6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32D8600C-3134-48EF-BDC6-AEC26064EFEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32D8600C-3134-48EF-BDC6-AEC26064EFEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32D8600C-3134-48EF-BDC6-AEC26064EFEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32D8600C-3134-48EF-BDC6-AEC26064EFEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97AA55FE-40A9-4084-AA08-D178FEFB18AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97AA55FE-40A9-4084-AA08-D178FEFB18AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97AA55FE-40A9-4084-AA08-D178FEFB18AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97AA55FE-40A9-4084-AA08-D178FEFB18AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{986272FB-E5C6-4881-9867-DC3427D883AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFBFBBE6-F5EC-4889-9F34-03E07562630D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{45E0A981-A131-4147-94E7-49AAC45F5D14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6383A7BA-20DC-4025-9BB3-E1C6FEA669E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F55B699-FA9A-4B4E-BAB1-DD288465D9E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F55B699-FA9A-4B4E-BAB1-DD288465D9E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F55B699-FA9A-4B4E-BAB1-DD288465D9E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F55B699-FA9A-4B4E-BAB1-DD288465D9E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D3AC7A1-5C3F-43A8-8C7F-FB441BE1A875}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D3AC7A1-5C3F-43A8-8C7F-FB441BE1A875}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D3AC7A1-5C3F-43A8-8C7F-FB441BE1A875}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D3AC7A1-5C3F-43A8-8C7F-FB441BE1A875}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A154C9F1-845A-4596-9061-92C462E971A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EC5D61F1-E77B-4E3D-968C-710FCFB9E028}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{397E49A7-EB26-4368-8F46-D78B98F4A971} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A7B6FB6E-F484-42D7-8A5E-F7D0DCC03829} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{3B7A97BD-F4DC-4FF9-AB6D-3B714E5D9280} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{57836C98-D90B-4D78-9203-B6DB2C8098DB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2BA97A91-2C8E-4D7E-AECF-FABAE4C8DD2E}
+		SolutionGuid = {7B9B7D16-2C48-486A-B84B-6FF6D28509F6}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln b/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
index 8299c3e7ef2e2d..189e4edf9120f5 100644
--- a/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
+++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.sln
@@ -1,60 +1,72 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests\System.Runtime.CompilerServices.Unsafe.Tests.csproj", "{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}"
-	ProjectSection(ProjectDependencies) = postProject
-		{04BA3E3C-6979-4792-B19E-C797AD607F42} = {04BA3E3C-6979-4792-B19E-C797AD607F42}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D1D35FBB-464B-4403-A933-9A96861999D1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "src\System.Runtime.CompilerServices.Unsafe.ilproj", "{04BA3E3C-6979-4792-B19E-C797AD607F42}"
-	ProjectSection(ProjectDependencies) = postProject
-		{649A377C-1E07-4105-B01F-7F1044D3356C} = {649A377C-1E07-4105-B01F-7F1044D3356C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{12A6F95F-B631-4CE0-BF7B-7D585812D70D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "ref\System.Runtime.CompilerServices.Unsafe.csproj", "{649A377C-1E07-4105-B01F-7F1044D3356C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F858493F-8DFC-43AD-B4AA-10419588E026}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe.Tests", "tests\System.Runtime.CompilerServices.Unsafe.Tests.csproj", "{03B3163A-B7D7-4BEC-90BC-12E04072969E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{C6EB8DAB-CD56-4C74-B079-D862C020BDCA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5F136691-8A7A-40FF-97BB-A44C59CF71A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{CDD9B53F-5E93-4259-98FD-EDE069D61B09}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{7216C4B5-BF51-4F1A-B61D-40F87F50B4FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7AC2FAAD-90AE-490C-8916-4D4E608EB158}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{97863A6C-F089-4035-B8A6-CB00EEF63AD6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{D1D35FBB-464B-4403-A933-9A96861999D1} = {7216C4B5-BF51-4F1A-B61D-40F87F50B4FD}
+		{03B3163A-B7D7-4BEC-90BC-12E04072969E} = {7216C4B5-BF51-4F1A-B61D-40F87F50B4FD}
+		{12A6F95F-B631-4CE0-BF7B-7D585812D70D} = {7AC2FAAD-90AE-490C-8916-4D4E608EB158}
+		{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8} = {7AC2FAAD-90AE-490C-8916-4D4E608EB158}
+		{C6EB8DAB-CD56-4C74-B079-D862C020BDCA} = {7AC2FAAD-90AE-490C-8916-4D4E608EB158}
+		{CDD9B53F-5E93-4259-98FD-EDE069D61B09} = {7AC2FAAD-90AE-490C-8916-4D4E608EB158}
+		{F858493F-8DFC-43AD-B4AA-10419588E026} = {97863A6C-F089-4035-B8A6-CB00EEF63AD6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08}.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
-		{649A377C-1E07-4105-B01F-7F1044D3356C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{649A377C-1E07-4105-B01F-7F1044D3356C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{649A377C-1E07-4105-B01F-7F1044D3356C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{649A377C-1E07-4105-B01F-7F1044D3356C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5F136691-8A7A-40FF-97BB-A44C59CF71A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F136691-8A7A-40FF-97BB-A44C59CF71A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F136691-8A7A-40FF-97BB-A44C59CF71A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F136691-8A7A-40FF-97BB-A44C59CF71A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1D35FBB-464B-4403-A933-9A96861999D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1D35FBB-464B-4403-A933-9A96861999D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1D35FBB-464B-4403-A933-9A96861999D1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12A6F95F-B631-4CE0-BF7B-7D585812D70D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A6F95F-B631-4CE0-BF7B-7D585812D70D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12A6F95F-B631-4CE0-BF7B-7D585812D70D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12A6F95F-B631-4CE0-BF7B-7D585812D70D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C75CDE9E-42CE-41E6-81BC-BD44FBC113E8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F858493F-8DFC-43AD-B4AA-10419588E026}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F858493F-8DFC-43AD-B4AA-10419588E026}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F858493F-8DFC-43AD-B4AA-10419588E026}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F858493F-8DFC-43AD-B4AA-10419588E026}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03B3163A-B7D7-4BEC-90BC-12E04072969E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6EB8DAB-CD56-4C74-B079-D862C020BDCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6EB8DAB-CD56-4C74-B079-D862C020BDCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6EB8DAB-CD56-4C74-B079-D862C020BDCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6EB8DAB-CD56-4C74-B079-D862C020BDCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDD9B53F-5E93-4259-98FD-EDE069D61B09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDD9B53F-5E93-4259-98FD-EDE069D61B09}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDD9B53F-5E93-4259-98FD-EDE069D61B09}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDD9B53F-5E93-4259-98FD-EDE069D61B09}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8012DD70-A6D7-45C0-BC8E-DFFB48D86E08} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{04BA3E3C-6979-4792-B19E-C797AD607F42} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{649A377C-1E07-4105-B01F-7F1044D3356C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{5F136691-8A7A-40FF-97BB-A44C59CF71A6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7008F50A-EE83-4217-8180-F76C648F682F}
+		SolutionGuid = {7C6BD655-03F9-4AFB-B429-05A363FA6DA0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln b/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
index 8466660366ffe4..cbb881a3e7389e 100644
--- a/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
+++ b/src/libraries/System.Runtime.CompilerServices.VisualC/System.Runtime.CompilerServices.VisualC.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC.Tests", "tests\System.Runtime.CompilerServices.VisualC.Tests.csproj", "{057BF9A0-199B-4EB5-85D5-84982259C7BC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E} = {F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1415080F-E571-4350-97F8-36D1871AA17D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC", "src\System.Runtime.CompilerServices.VisualC.csproj", "{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2122228D-ADAD-43D8-BC56-6A061DE8B25C} = {2122228D-ADAD-43D8-BC56-6A061DE8B25C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{97C3FEA1-EE20-4848-B468-36F3E59863B0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC", "ref\System.Runtime.CompilerServices.VisualC.csproj", "{2122228D-ADAD-43D8-BC56-6A061DE8B25C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E57BD2F0-8235-49FF-B3CD-76A40804E472}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{72E42933-6469-41D3-97B6-B522FB20FF62}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC", "ref\System.Runtime.CompilerServices.VisualC.csproj", "{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC", "src\System.Runtime.CompilerServices.VisualC.csproj", "{941D72C5-CA37-4745-B89D-2257517C5761}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{062B7E35-224E-4DB3-A3A4-35352CAFA50A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.VisualC.Tests", "tests\System.Runtime.CompilerServices.VisualC.Tests.csproj", "{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{39821B61-69B3-414A-99CF-FE7E494AEA90}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EB300642-E2DA-47F8-ABBE-3405255DB147}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{656D312B-3BC5-45FD-9794-284E1DFDFB95}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DA445583-A5C7-49FE-ADF6-046990E6D858}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47F487BB-CF6F-4543-9670-5551D32E22B8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1415080F-E571-4350-97F8-36D1871AA17D} = {656D312B-3BC5-45FD-9794-284E1DFDFB95}
+		{11D31B6C-3ECF-472B-8AD5-3D799BA3F052} = {656D312B-3BC5-45FD-9794-284E1DFDFB95}
+		{97C3FEA1-EE20-4848-B468-36F3E59863B0} = {DA445583-A5C7-49FE-ADF6-046990E6D858}
+		{E57BD2F0-8235-49FF-B3CD-76A40804E472} = {DA445583-A5C7-49FE-ADF6-046990E6D858}
+		{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22} = {DA445583-A5C7-49FE-ADF6-046990E6D858}
+		{39821B61-69B3-414A-99CF-FE7E494AEA90} = {DA445583-A5C7-49FE-ADF6-046990E6D858}
+		{EB300642-E2DA-47F8-ABBE-3405255DB147} = {DA445583-A5C7-49FE-ADF6-046990E6D858}
+		{72E42933-6469-41D3-97B6-B522FB20FF62} = {47F487BB-CF6F-4543-9670-5551D32E22B8}
+		{941D72C5-CA37-4745-B89D-2257517C5761} = {47F487BB-CF6F-4543-9670-5551D32E22B8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{057BF9A0-199B-4EB5-85D5-84982259C7BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{057BF9A0-199B-4EB5-85D5-84982259C7BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{057BF9A0-199B-4EB5-85D5-84982259C7BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{057BF9A0-199B-4EB5-85D5-84982259C7BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2122228D-ADAD-43D8-BC56-6A061DE8B25C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{062B7E35-224E-4DB3-A3A4-35352CAFA50A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{062B7E35-224E-4DB3-A3A4-35352CAFA50A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{062B7E35-224E-4DB3-A3A4-35352CAFA50A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{062B7E35-224E-4DB3-A3A4-35352CAFA50A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1415080F-E571-4350-97F8-36D1871AA17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1415080F-E571-4350-97F8-36D1871AA17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1415080F-E571-4350-97F8-36D1871AA17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1415080F-E571-4350-97F8-36D1871AA17D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97C3FEA1-EE20-4848-B468-36F3E59863B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97C3FEA1-EE20-4848-B468-36F3E59863B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97C3FEA1-EE20-4848-B468-36F3E59863B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97C3FEA1-EE20-4848-B468-36F3E59863B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E57BD2F0-8235-49FF-B3CD-76A40804E472}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E57BD2F0-8235-49FF-B3CD-76A40804E472}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E57BD2F0-8235-49FF-B3CD-76A40804E472}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E57BD2F0-8235-49FF-B3CD-76A40804E472}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72E42933-6469-41D3-97B6-B522FB20FF62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72E42933-6469-41D3-97B6-B522FB20FF62}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72E42933-6469-41D3-97B6-B522FB20FF62}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72E42933-6469-41D3-97B6-B522FB20FF62}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6157FC12-0BEC-4A23-80F0-FBC8A8C71E22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{941D72C5-CA37-4745-B89D-2257517C5761}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{941D72C5-CA37-4745-B89D-2257517C5761}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{941D72C5-CA37-4745-B89D-2257517C5761}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{941D72C5-CA37-4745-B89D-2257517C5761}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11D31B6C-3ECF-472B-8AD5-3D799BA3F052}.Release|Any CPU.Build.0 = Release|Any CPU
+		{39821B61-69B3-414A-99CF-FE7E494AEA90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{39821B61-69B3-414A-99CF-FE7E494AEA90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{39821B61-69B3-414A-99CF-FE7E494AEA90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{39821B61-69B3-414A-99CF-FE7E494AEA90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB300642-E2DA-47F8-ABBE-3405255DB147}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB300642-E2DA-47F8-ABBE-3405255DB147}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB300642-E2DA-47F8-ABBE-3405255DB147}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB300642-E2DA-47F8-ABBE-3405255DB147}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{057BF9A0-199B-4EB5-85D5-84982259C7BC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F8C8FBFC-CA6E-4BDA-A1B3-FA4E17C10D9E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{2122228D-ADAD-43D8-BC56-6A061DE8B25C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{062B7E35-224E-4DB3-A3A4-35352CAFA50A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {AE3AA6A2-75B8-4797-81D2-A1B475D1D5C4}
+		SolutionGuid = {568C6D8F-F5AD-4703-A695-EA54585C33D0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
index d5fee5bc48286a..d6bcd1af77c08a 100644
--- a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
+++ b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln
@@ -1,114 +1,339 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions.Tests", "tests\System.Runtime.Extensions.Tests.csproj", "{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveTestApp", "tests\AssemblyResolveTestApp\AssemblyResolveTestApp.csproj", "{E60AFAE8-2EA7-471C-9E24-52A99453B26B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D7A1E176-1515-41FE-86D0-A46C82B87B05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "tests\TestApp\TestApp.csproj", "{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FDADC7A8-E992-492E-BE11-30EDC29C330B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAppOutsideOfTPA", "tests\TestAppOutsideOfTPA\TestAppOutsideOfTPA.csproj", "{C44B33E3-F89F-40B9-B353-D380C1524988}"
-	ProjectSection(ProjectDependencies) = postProject
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoidMainWithExitCodeApp", "tests\VoidMainWithExitCodeApp\VoidMainWithExitCodeApp.csproj", "{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}"
-	ProjectSection(ProjectDependencies) = postProject
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "src\System.Runtime.Extensions.csproj", "{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{33B27785-02FD-4544-8E7D-EB802248BEC3} = {33B27785-02FD-4544-8E7D-EB802248BEC3}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "ref\System.Runtime.Extensions.csproj", "{33B27785-02FD-4544-8E7D-EB802248BEC3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "ref\System.Runtime.Extensions.csproj", "{959EAFBC-9394-4E25-9A84-0B85152A7FCD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "src\System.Runtime.Extensions.csproj", "{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveTestApp", "tests\AssemblyResolveTestApp\AssemblyResolveTestApp.csproj", "{01EC2059-605F-472C-A255-ED76197F62CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions.Tests", "tests\System.Runtime.Extensions.Tests.csproj", "{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{471E2D8C-6019-4ACF-9325-10B1D42A45B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TargetFrameworkNameTestApp", "tests\TargetFrameworkNameTestApp\TargetFrameworkNameTestApp.csproj", "{9192FB4F-9A3B-48CA-AB53-322888009601}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{BBF67D35-3E00-4237-8F82-17449F89FC64}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestApp", "tests\TestApp\TestApp.csproj", "{1FDA0C56-0687-4F08-B147-E997C026A12D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{D8491ED4-5856-4A56-AD74-38928BAFD525}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestAppOutsideOfTPA", "tests\TestAppOutsideOfTPA\TestAppOutsideOfTPA.csproj", "{397D1AB1-0A29-462A-9F05-14015B8B5796}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoidMainWithExitCodeApp", "tests\VoidMainWithExitCodeApp\VoidMainWithExitCodeApp.csproj", "{F55614A7-859C-4171-844B-46F37EDDD351}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{69D31E64-8622-4C3E-9984-F6A15B4C082D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2212F409-51BE-4194-8B73-232C23CF6546}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AD77A0E1-B4B5-48A3-9BFE-D5448B10022D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F6C70DDD-E262-4F1F-91C7-767E5329306C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{54C17E6F-FA69-4EC9-8891-F3D1300ABE58}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7} = {AD77A0E1-B4B5-48A3-9BFE-D5448B10022D}
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2} = {AD77A0E1-B4B5-48A3-9BFE-D5448B10022D}
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D} = {AD77A0E1-B4B5-48A3-9BFE-D5448B10022D}
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A} = {AD77A0E1-B4B5-48A3-9BFE-D5448B10022D}
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8} = {AD77A0E1-B4B5-48A3-9BFE-D5448B10022D}
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{01EC2059-605F-472C-A255-ED76197F62CD} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{9192FB4F-9A3B-48CA-AB53-322888009601} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{1FDA0C56-0687-4F08-B147-E997C026A12D} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{397D1AB1-0A29-462A-9F05-14015B8B5796} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{F55614A7-859C-4171-844B-46F37EDDD351} = {F6C70DDD-E262-4F1F-91C7-767E5329306C}
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B} = {54C17E6F-FA69-4EC9-8891-F3D1300ABE58}
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9} = {54C17E6F-FA69-4EC9-8891-F3D1300ABE58}
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD} = {54C17E6F-FA69-4EC9-8891-F3D1300ABE58}
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D} = {54C17E6F-FA69-4EC9-8891-F3D1300ABE58}
+		{2212F409-51BE-4194-8B73-232C23CF6546} = {54C17E6F-FA69-4EC9-8891-F3D1300ABE58}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E60AFAE8-2EA7-471C-9E24-52A99453B26B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C44B33E3-F89F-40B9-B353-D380C1524988}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C44B33E3-F89F-40B9-B353-D380C1524988}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F312D76-9AF1-4E90-B3B0-815A1EC6C346}.Release|Any CPU.Build.0 = Release|Any CPU
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33B27785-02FD-4544-8E7D-EB802248BEC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33B27785-02FD-4544-8E7D-EB802248BEC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33B27785-02FD-4544-8E7D-EB802248BEC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33B27785-02FD-4544-8E7D-EB802248BEC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{471E2D8C-6019-4ACF-9325-10B1D42A45B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{471E2D8C-6019-4ACF-9325-10B1D42A45B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{471E2D8C-6019-4ACF-9325-10B1D42A45B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{471E2D8C-6019-4ACF-9325-10B1D42A45B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BBF67D35-3E00-4237-8F82-17449F89FC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BBF67D35-3E00-4237-8F82-17449F89FC64}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BBF67D35-3E00-4237-8F82-17449F89FC64}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BBF67D35-3E00-4237-8F82-17449F89FC64}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8491ED4-5856-4A56-AD74-38928BAFD525}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8491ED4-5856-4A56-AD74-38928BAFD525}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8491ED4-5856-4A56-AD74-38928BAFD525}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8491ED4-5856-4A56-AD74-38928BAFD525}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Debug|Any CPU.Build.0 = Debug|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Debug|x64.ActiveCfg = Debug|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Debug|x64.Build.0 = Debug|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Debug|x86.ActiveCfg = Debug|x86
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Debug|x86.Build.0 = Debug|x86
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Release|Any CPU.ActiveCfg = Release|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Release|Any CPU.Build.0 = Release|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Release|x64.ActiveCfg = Release|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Release|x64.Build.0 = Release|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Release|x86.ActiveCfg = Release|x86
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Release|x86.Build.0 = Release|x86
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Checked|Any CPU.Build.0 = Checked|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Checked|x64.ActiveCfg = Checked|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Checked|x64.Build.0 = Checked|x64
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Checked|x86.ActiveCfg = Checked|x86
+		{5D8A8EF7-9A44-45C3-B7B2-B44A296A1BE7}.Checked|x86.Build.0 = Checked|x86
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Debug|x86.Build.0 = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Release|x64.Build.0 = Release|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Release|x86.Build.0 = Release|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D7A1E176-1515-41FE-86D0-A46C82B87B05}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Debug|x64.Build.0 = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Debug|x86.Build.0 = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Release|x64.ActiveCfg = Release|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Release|x64.Build.0 = Release|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Release|x86.ActiveCfg = Release|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Release|x86.Build.0 = Release|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FDADC7A8-E992-492E-BE11-30EDC29C330B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Release|x64.Build.0 = Release|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Release|x86.Build.0 = Release|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1E0C4DD8-3A04-4B4C-9699-DB5844F2CFB2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x64.Build.0 = Release|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Release|x86.Build.0 = Release|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8B176D63-5A92-4A28-B0BB-7FA9EDA3A4F9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Debug|x64.Build.0 = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Debug|x86.Build.0 = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Release|x64.ActiveCfg = Release|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Release|x64.Build.0 = Release|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Release|x86.Build.0 = Release|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F421E24B-06BE-4D6F-A9E1-C8E4F4513D9D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|x64.Build.0 = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Debug|x86.Build.0 = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Release|x64.ActiveCfg = Release|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Release|x64.Build.0 = Release|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Release|x86.ActiveCfg = Release|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Release|x86.Build.0 = Release|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{959EAFBC-9394-4E25-9A84-0B85152A7FCD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Debug|x64.Build.0 = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Debug|x86.Build.0 = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Release|x64.ActiveCfg = Release|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Release|x64.Build.0 = Release|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Release|x86.ActiveCfg = Release|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Release|x86.Build.0 = Release|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FF0EFAEE-3E1A-4C7B-8B4A-AAC8E0988A0A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Release|x64.Build.0 = Release|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Release|x86.Build.0 = Release|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{01EC2059-605F-472C-A255-ED76197F62CD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Debug|x64.Build.0 = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Debug|x86.Build.0 = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Release|x64.ActiveCfg = Release|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Release|x64.Build.0 = Release|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Release|x86.ActiveCfg = Release|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Release|x86.Build.0 = Release|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AA1BB6A8-7CC0-46BA-B83B-13B1F4CF825E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Debug|x64.Build.0 = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Debug|x86.Build.0 = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Release|x64.ActiveCfg = Release|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Release|x64.Build.0 = Release|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Release|x86.ActiveCfg = Release|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Release|x86.Build.0 = Release|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9192FB4F-9A3B-48CA-AB53-322888009601}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Debug|x64.Build.0 = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Debug|x86.Build.0 = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Release|x64.ActiveCfg = Release|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Release|x64.Build.0 = Release|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Release|x86.ActiveCfg = Release|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Release|x86.Build.0 = Release|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1FDA0C56-0687-4F08-B147-E997C026A12D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Debug|x64.Build.0 = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Debug|x86.Build.0 = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Release|Any CPU.Build.0 = Release|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Release|x64.ActiveCfg = Release|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Release|x64.Build.0 = Release|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Release|x86.ActiveCfg = Release|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Release|x86.Build.0 = Release|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{397D1AB1-0A29-462A-9F05-14015B8B5796}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Debug|x64.Build.0 = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Debug|x86.Build.0 = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Release|x64.ActiveCfg = Release|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Release|x64.Build.0 = Release|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Release|x86.ActiveCfg = Release|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Release|x86.Build.0 = Release|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F55614A7-859C-4171-844B-46F37EDDD351}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Release|x64.Build.0 = Release|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Release|x86.Build.0 = Release|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2F9303F6-6EF0-4B14-80B9-A4D9BDA10AE8}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Debug|x64.Build.0 = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Debug|x86.Build.0 = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Release|x64.ActiveCfg = Release|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Release|x64.Build.0 = Release|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Release|x86.ActiveCfg = Release|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Release|x86.Build.0 = Release|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{69D31E64-8622-4C3E-9984-F6A15B4C082D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Debug|x64.Build.0 = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Debug|x86.Build.0 = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Release|x64.ActiveCfg = Release|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Release|x64.Build.0 = Release|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Release|x86.ActiveCfg = Release|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Release|x86.Build.0 = Release|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2212F409-51BE-4194-8B73-232C23CF6546}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6C314C9B-3D28-4B05-9B4C-B57A00A9B3B9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E60AFAE8-2EA7-471C-9E24-52A99453B26B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{24BCEC6B-B9D2-47BC-9D66-725BD6B526FA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C44B33E3-F89F-40B9-B353-D380C1524988} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{9F312D76-9AF1-4E90-B3B0-815A1EC6C346} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{33B27785-02FD-4544-8E7D-EB802248BEC3} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{471E2D8C-6019-4ACF-9325-10B1D42A45B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{BBF67D35-3E00-4237-8F82-17449F89FC64} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D8491ED4-5856-4A56-AD74-38928BAFD525} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A72515DE-1334-4155-9DB7-4EA49A6F5AA0}
+		SolutionGuid = {D347D246-1A9D-4D45-83A4-58C47241FE13}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
index f1659ae0cfcc83..1322438632a9d6 100644
--- a/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
+++ b/src/libraries/System.Runtime.Handles/System.Runtime.Handles.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles.Tests", "tests\System.Runtime.Handles.Tests.csproj", "{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D85EE71C-F05B-4331-9300-8E2833D49E19} = {D85EE71C-F05B-4331-9300-8E2833D49E19}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C2EBFF8C-0395-44E4-807C-B1BE41B339E3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "src\System.Runtime.Handles.csproj", "{D85EE71C-F05B-4331-9300-8E2833D49E19}"
-	ProjectSection(ProjectDependencies) = postProject
-		{46C4C03C-3055-4E97-858B-3E83CB862262} = {46C4C03C-3055-4E97-858B-3E83CB862262}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{12521F0A-DB8A-4AEC-9C87-FEF336E60C4D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "ref\System.Runtime.Handles.csproj", "{46C4C03C-3055-4E97-858B-3E83CB862262}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{122D80EB-D5F2-4228-8657-2BF93DBFB22C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B3083B91-237A-4646-97E8-F59B8A3C1E5F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "ref\System.Runtime.Handles.csproj", "{26C50637-E915-450B-93DB-B11A2678CFAF}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles", "src\System.Runtime.Handles.csproj", "{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0F0900A5-5E78-4504-B274-F9B631F3B824}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Handles.Tests", "tests\System.Runtime.Handles.Tests.csproj", "{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D9F2C6F3-95A4-49DB-B1FD-AE3BD2FC1763}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{A4F36279-B455-4C5B-A4D8-D338ED726EC9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{83AE7485-51D0-4026-968E-2176DE2F11F1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0E635412-3218-49BF-A528-A6504D09EBF4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{92F26E40-989E-403E-AB9C-B03624CA9891}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C2EBFF8C-0395-44E4-807C-B1BE41B339E3} = {83AE7485-51D0-4026-968E-2176DE2F11F1}
+		{2C0117E7-BC37-4C3F-A291-9C45AEA68F02} = {83AE7485-51D0-4026-968E-2176DE2F11F1}
+		{12521F0A-DB8A-4AEC-9C87-FEF336E60C4D} = {0E635412-3218-49BF-A528-A6504D09EBF4}
+		{122D80EB-D5F2-4228-8657-2BF93DBFB22C} = {0E635412-3218-49BF-A528-A6504D09EBF4}
+		{26C50637-E915-450B-93DB-B11A2678CFAF} = {0E635412-3218-49BF-A528-A6504D09EBF4}
+		{D9F2C6F3-95A4-49DB-B1FD-AE3BD2FC1763} = {0E635412-3218-49BF-A528-A6504D09EBF4}
+		{A4F36279-B455-4C5B-A4D8-D338ED726EC9} = {0E635412-3218-49BF-A528-A6504D09EBF4}
+		{B3083B91-237A-4646-97E8-F59B8A3C1E5F} = {92F26E40-989E-403E-AB9C-B03624CA9891}
+		{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F} = {92F26E40-989E-403E-AB9C-B03624CA9891}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D85EE71C-F05B-4331-9300-8E2833D49E19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D85EE71C-F05B-4331-9300-8E2833D49E19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D85EE71C-F05B-4331-9300-8E2833D49E19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D85EE71C-F05B-4331-9300-8E2833D49E19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{46C4C03C-3055-4E97-858B-3E83CB862262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{46C4C03C-3055-4E97-858B-3E83CB862262}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{46C4C03C-3055-4E97-858B-3E83CB862262}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{46C4C03C-3055-4E97-858B-3E83CB862262}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F0900A5-5E78-4504-B274-F9B631F3B824}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F0900A5-5E78-4504-B274-F9B631F3B824}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F0900A5-5E78-4504-B274-F9B631F3B824}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F0900A5-5E78-4504-B274-F9B631F3B824}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2EBFF8C-0395-44E4-807C-B1BE41B339E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12521F0A-DB8A-4AEC-9C87-FEF336E60C4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12521F0A-DB8A-4AEC-9C87-FEF336E60C4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12521F0A-DB8A-4AEC-9C87-FEF336E60C4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12521F0A-DB8A-4AEC-9C87-FEF336E60C4D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{122D80EB-D5F2-4228-8657-2BF93DBFB22C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3083B91-237A-4646-97E8-F59B8A3C1E5F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26C50637-E915-450B-93DB-B11A2678CFAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26C50637-E915-450B-93DB-B11A2678CFAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26C50637-E915-450B-93DB-B11A2678CFAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26C50637-E915-450B-93DB-B11A2678CFAF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FB6B1B7-FA5C-4E13-BA3E-2FD95018237F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C0117E7-BC37-4C3F-A291-9C45AEA68F02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9F2C6F3-95A4-49DB-B1FD-AE3BD2FC1763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9F2C6F3-95A4-49DB-B1FD-AE3BD2FC1763}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9F2C6F3-95A4-49DB-B1FD-AE3BD2FC1763}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9F2C6F3-95A4-49DB-B1FD-AE3BD2FC1763}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4F36279-B455-4C5B-A4D8-D338ED726EC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4F36279-B455-4C5B-A4D8-D338ED726EC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4F36279-B455-4C5B-A4D8-D338ED726EC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4F36279-B455-4C5B-A4D8-D338ED726EC9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9C77C3CA-7067-4D45-BDFE-CC62AB5C1ED5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D85EE71C-F05B-4331-9300-8E2833D49E19} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{46C4C03C-3055-4E97-858B-3E83CB862262} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0F0900A5-5E78-4504-B274-F9B631F3B824} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {841E2B0F-0D06-4807-B967-DD0F6178214E}
+		SolutionGuid = {08352DB8-2D6F-4ABA-939D-9080EFA16409}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
index b5c7a0c4ca8301..494fa72b8d8640 100644
--- a/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
+++ b/src/libraries/System.Runtime.InteropServices.RuntimeInformation/System.Runtime.InteropServices.RuntimeInformation.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests\System.Runtime.InteropServices.RuntimeInformation.Tests.csproj", "{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2} = {1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{330C46C6-15A6-4713-A227-3BFA379D4479}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation", "src\System.Runtime.InteropServices.RuntimeInformation.csproj", "{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7} = {9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9CCFC6F9-6A43-4219-B92F-7F5904218B87}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation", "ref\System.Runtime.InteropServices.RuntimeInformation.csproj", "{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BB55A91F-822B-4D5C-B3A2-02372BB356FA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{0A1860C3-7207-49CE-B921-A9A76EA4A9DB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation", "ref\System.Runtime.InteropServices.RuntimeInformation.csproj", "{B2937043-2666-41F2-A72B-FA9CDBBC012A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation", "src\System.Runtime.InteropServices.RuntimeInformation.csproj", "{375DB818-0E7E-4361-9C56-07658B666B8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{924F4527-C208-40A5-B7B8-34305878581E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.RuntimeInformation.Tests", "tests\System.Runtime.InteropServices.RuntimeInformation.Tests.csproj", "{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D3A57789-B0FA-4D78-A54F-0C66F36ED7A7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{A19CEDB4-5DA7-4371-A5A5-497104B9531A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{53AE1161-5317-4738-B5CF-B7F6A55E1921}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6AC01188-469D-4BBC-8579-66658659D3EE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{11C5C45A-8ED7-47BD-BD69-51AC702D8AB2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{330C46C6-15A6-4713-A227-3BFA379D4479} = {53AE1161-5317-4738-B5CF-B7F6A55E1921}
+		{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8} = {53AE1161-5317-4738-B5CF-B7F6A55E1921}
+		{9CCFC6F9-6A43-4219-B92F-7F5904218B87} = {6AC01188-469D-4BBC-8579-66658659D3EE}
+		{BB55A91F-822B-4D5C-B3A2-02372BB356FA} = {6AC01188-469D-4BBC-8579-66658659D3EE}
+		{B2937043-2666-41F2-A72B-FA9CDBBC012A} = {6AC01188-469D-4BBC-8579-66658659D3EE}
+		{D3A57789-B0FA-4D78-A54F-0C66F36ED7A7} = {6AC01188-469D-4BBC-8579-66658659D3EE}
+		{A19CEDB4-5DA7-4371-A5A5-497104B9531A} = {6AC01188-469D-4BBC-8579-66658659D3EE}
+		{0A1860C3-7207-49CE-B921-A9A76EA4A9DB} = {11C5C45A-8ED7-47BD-BD69-51AC702D8AB2}
+		{375DB818-0E7E-4361-9C56-07658B666B8B} = {11C5C45A-8ED7-47BD-BD69-51AC702D8AB2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B4D1DA9-AA4C-428F-9F66-D45C924025A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{924F4527-C208-40A5-B7B8-34305878581E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{924F4527-C208-40A5-B7B8-34305878581E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{924F4527-C208-40A5-B7B8-34305878581E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{924F4527-C208-40A5-B7B8-34305878581E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{330C46C6-15A6-4713-A227-3BFA379D4479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{330C46C6-15A6-4713-A227-3BFA379D4479}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{330C46C6-15A6-4713-A227-3BFA379D4479}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{330C46C6-15A6-4713-A227-3BFA379D4479}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CCFC6F9-6A43-4219-B92F-7F5904218B87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CCFC6F9-6A43-4219-B92F-7F5904218B87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CCFC6F9-6A43-4219-B92F-7F5904218B87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CCFC6F9-6A43-4219-B92F-7F5904218B87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB55A91F-822B-4D5C-B3A2-02372BB356FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A1860C3-7207-49CE-B921-A9A76EA4A9DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B2937043-2666-41F2-A72B-FA9CDBBC012A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B2937043-2666-41F2-A72B-FA9CDBBC012A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B2937043-2666-41F2-A72B-FA9CDBBC012A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B2937043-2666-41F2-A72B-FA9CDBBC012A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{375DB818-0E7E-4361-9C56-07658B666B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{375DB818-0E7E-4361-9C56-07658B666B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{375DB818-0E7E-4361-9C56-07658B666B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{375DB818-0E7E-4361-9C56-07658B666B8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4DFEE89A-C5B1-4D3E-9B34-96A2D6E98DB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3A57789-B0FA-4D78-A54F-0C66F36ED7A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3A57789-B0FA-4D78-A54F-0C66F36ED7A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3A57789-B0FA-4D78-A54F-0C66F36ED7A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3A57789-B0FA-4D78-A54F-0C66F36ED7A7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A19CEDB4-5DA7-4371-A5A5-497104B9531A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A19CEDB4-5DA7-4371-A5A5-497104B9531A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A19CEDB4-5DA7-4371-A5A5-497104B9531A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A19CEDB4-5DA7-4371-A5A5-497104B9531A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{9B4D1DA9-AA4C-428F-9F66-D45C924025A5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1CBC030D-B5D3-4AB5-A9FD-24EC5F6F38D2} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{9E5D12CD-67C1-4A01-80DF-02CEC3154BB7} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{924F4527-C208-40A5-B7B8-34305878581E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0F1D774A-A3AA-4687-A6C3-2892FE40E176}
+		SolutionGuid = {8C10FECD-1847-429D-9777-81F246B05D48}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
index 2253a46fd0b6af..dff4fac3a4798d 100644
--- a/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
+++ b/src/libraries/System.Runtime.InteropServices/System.Runtime.InteropServices.sln
@@ -1,67 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.Tests", "tests\System.Runtime.InteropServices.Tests.csproj", "{A824F4CD-935B-4496-A1B2-C3664936DA7B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE} = {EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{94B59BA0-491F-4B59-ADFF-A057EC3EC835}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices", "src\System.Runtime.InteropServices.csproj", "{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B17014F1-D902-417F-89B0-271204695831} = {B17014F1-D902-417F-89B0-271204695831}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices", "ref\System.Runtime.InteropServices.csproj", "{B17014F1-D902-417F-89B0-271204695831}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{EB306595-C964-474F-AFEE-803C886E4B8B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{5BB5F99F-1052-4EB4-B12E-7863805661F3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{23735A0B-AB51-4C1D-BD88-5240D672DD33}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices", "ref\System.Runtime.InteropServices.csproj", "{8671F164-F78C-44FA-93B7-A310F67890FE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FC3991FA-C265-41A9-96D2-CB5C45C22668}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices", "src\System.Runtime.InteropServices.csproj", "{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{A36D14F2-5700-4508-AC6E-00787D2319A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.InteropServices.Tests", "tests\System.Runtime.InteropServices.Tests.csproj", "{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{92B81157-BB47-4A19-9229-23AE9B126DAA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F66D19A6-4D11-45EC-B73F-7F4E4F8DB76B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{451A41C1-B1BC-49DE-8F3F-26F2D8BF841A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E7481FAF-728B-448D-9A38-88B40E3C400E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835} = {F66D19A6-4D11-45EC-B73F-7F4E4F8DB76B}
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33} = {F66D19A6-4D11-45EC-B73F-7F4E4F8DB76B}
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1} = {F66D19A6-4D11-45EC-B73F-7F4E4F8DB76B}
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA} = {451A41C1-B1BC-49DE-8F3F-26F2D8BF841A}
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664} = {451A41C1-B1BC-49DE-8F3F-26F2D8BF841A}
+		{EB306595-C964-474F-AFEE-803C886E4B8B} = {E7481FAF-728B-448D-9A38-88B40E3C400E}
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3} = {E7481FAF-728B-448D-9A38-88B40E3C400E}
+		{8671F164-F78C-44FA-93B7-A310F67890FE} = {E7481FAF-728B-448D-9A38-88B40E3C400E}
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543} = {E7481FAF-728B-448D-9A38-88B40E3C400E}
+		{92B81157-BB47-4A19-9229-23AE9B126DAA} = {E7481FAF-728B-448D-9A38-88B40E3C400E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A824F4CD-935B-4496-A1B2-C3664936DA7B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B17014F1-D902-417F-89B0-271204695831}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B17014F1-D902-417F-89B0-271204695831}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FC3991FA-C265-41A9-96D2-CB5C45C22668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FC3991FA-C265-41A9-96D2-CB5C45C22668}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FC3991FA-C265-41A9-96D2-CB5C45C22668}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FC3991FA-C265-41A9-96D2-CB5C45C22668}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A36D14F2-5700-4508-AC6E-00787D2319A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A36D14F2-5700-4508-AC6E-00787D2319A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A36D14F2-5700-4508-AC6E-00787D2319A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A36D14F2-5700-4508-AC6E-00787D2319A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|Any CPU.Build.0 = Debug|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|x64.ActiveCfg = Debug|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|x64.Build.0 = Debug|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|x86.ActiveCfg = Debug|x86
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Debug|x86.Build.0 = Debug|x86
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|Any CPU.ActiveCfg = Release|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|Any CPU.Build.0 = Release|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x64.ActiveCfg = Release|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x64.Build.0 = Release|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x86.ActiveCfg = Release|x86
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Release|x86.Build.0 = Release|x86
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|Any CPU.Build.0 = Checked|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x64.ActiveCfg = Checked|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x64.Build.0 = Checked|x64
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x86.ActiveCfg = Checked|x86
+		{94B59BA0-491F-4B59-ADFF-A057EC3EC835}.Checked|x86.Build.0 = Checked|x86
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|x64.Build.0 = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Debug|x86.Build.0 = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x64.ActiveCfg = Release|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x64.Build.0 = Release|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x86.ActiveCfg = Release|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Release|x86.Build.0 = Release|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1FF4CC8E-49C3-42A0-A6E0-2E5908455FBA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Debug|x64.Build.0 = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Debug|x86.Build.0 = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Release|x64.ActiveCfg = Release|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Release|x64.Build.0 = Release|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Release|x86.ActiveCfg = Release|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Release|x86.Build.0 = Release|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EB306595-C964-474F-AFEE-803C886E4B8B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x64.Build.0 = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Debug|x86.Build.0 = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x64.ActiveCfg = Release|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x64.Build.0 = Release|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Release|x86.Build.0 = Release|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5BB5F99F-1052-4EB4-B12E-7863805661F3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Debug|x64.Build.0 = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Debug|x86.Build.0 = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Release|x64.ActiveCfg = Release|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Release|x64.Build.0 = Release|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Release|x86.ActiveCfg = Release|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Release|x86.Build.0 = Release|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{23735A0B-AB51-4C1D-BD88-5240D672DD33}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|x64.Build.0 = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Debug|x86.Build.0 = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x64.ActiveCfg = Release|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x64.Build.0 = Release|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x86.ActiveCfg = Release|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Release|x86.Build.0 = Release|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8671F164-F78C-44FA-93B7-A310F67890FE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|x64.Build.0 = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Debug|x86.Build.0 = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x64.ActiveCfg = Release|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x64.Build.0 = Release|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Release|x86.Build.0 = Release|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4FC33B9B-1BCF-4D16-B886-DCA8F2B823C1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Debug|x64.Build.0 = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Debug|x86.Build.0 = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Release|x64.ActiveCfg = Release|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Release|x64.Build.0 = Release|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Release|x86.ActiveCfg = Release|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Release|x86.Build.0 = Release|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E249BD6A-85DB-4CE4-BD82-8D67EBAC5664}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Debug|x86.Build.0 = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Release|x64.Build.0 = Release|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Release|x86.Build.0 = Release|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B8C46FFD-86D0-4C84-97A5-60DDF29ED543}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Debug|x64.Build.0 = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Debug|x86.Build.0 = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Release|x64.ActiveCfg = Release|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Release|x64.Build.0 = Release|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Release|x86.ActiveCfg = Release|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Release|x86.Build.0 = Release|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{92B81157-BB47-4A19-9229-23AE9B126DAA}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A824F4CD-935B-4496-A1B2-C3664936DA7B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{EC6AA4D9-B3E8-4CCA-8AB1-8BBFD89266AE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B17014F1-D902-417F-89B0-271204695831} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{FC3991FA-C265-41A9-96D2-CB5C45C22668} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A36D14F2-5700-4508-AC6E-00787D2319A6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2FB12250-C235-4F6A-A3F2-8AB12B8AC4AE}
+		SolutionGuid = {D4031401-FEB5-4CCF-91C1-38F5646B2BFD}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
index 7e9816a5157d83..627fc6a427b775 100644
--- a/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
+++ b/src/libraries/System.Runtime.Intrinsics/System.Runtime.Intrinsics.sln
@@ -1,41 +1,85 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Intrinsics", "src\System.Runtime.Intrinsics.csproj", "{315E3C60-A5D9-4F47-A940-D57395EED606}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F9097917-AFA3-4E3E-A592-BFA2C483C7E2} = {F9097917-AFA3-4E3E-A592-BFA2C483C7E2}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{5965CFFE-886A-418C-854F-5967D91DE914}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Intrinsics", "ref\System.Runtime.Intrinsics.csproj", "{F9097917-AFA3-4E3E-A592-BFA2C483C7E2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Intrinsics", "ref\System.Runtime.Intrinsics.csproj", "{28B808CE-B1F8-4B05-9ADA-8884525BD87F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Intrinsics", "src\System.Runtime.Intrinsics.csproj", "{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{47B32900-BEBD-49E4-A54B-7A4BC87F0E68}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{65331E4B-EF91-413C-984B-51D110CE5AC6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5965CFFE-886A-418C-854F-5967D91DE914} = {47B32900-BEBD-49E4-A54B-7A4BC87F0E68}
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C} = {47B32900-BEBD-49E4-A54B-7A4BC87F0E68}
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F} = {65331E4B-EF91-413C-984B-51D110CE5AC6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{315E3C60-A5D9-4F47-A940-D57395EED606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{315E3C60-A5D9-4F47-A940-D57395EED606}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{315E3C60-A5D9-4F47-A940-D57395EED606}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{315E3C60-A5D9-4F47-A940-D57395EED606}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9097917-AFA3-4E3E-A592-BFA2C483C7E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Debug|Any CPU.Build.0 = Debug|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Debug|x64.ActiveCfg = Debug|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Debug|x64.Build.0 = Debug|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Debug|x86.ActiveCfg = Debug|x86
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Debug|x86.Build.0 = Debug|x86
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Release|Any CPU.ActiveCfg = Release|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Release|Any CPU.Build.0 = Release|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Release|x64.ActiveCfg = Release|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Release|x64.Build.0 = Release|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Release|x86.ActiveCfg = Release|x86
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Release|x86.Build.0 = Release|x86
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Checked|Any CPU.Build.0 = Checked|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Checked|x64.ActiveCfg = Checked|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Checked|x64.Build.0 = Checked|x64
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Checked|x86.ActiveCfg = Checked|x86
+		{5965CFFE-886A-418C-854F-5967D91DE914}.Checked|x86.Build.0 = Checked|x86
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Debug|x64.Build.0 = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Debug|x86.Build.0 = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Release|x64.ActiveCfg = Release|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Release|x64.Build.0 = Release|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Release|x86.ActiveCfg = Release|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Release|x86.Build.0 = Release|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{28B808CE-B1F8-4B05-9ADA-8884525BD87F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Debug|x64.Build.0 = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Debug|x86.Build.0 = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Release|x64.ActiveCfg = Release|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Release|x64.Build.0 = Release|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Release|x86.Build.0 = Release|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5AD79501-BEA5-48C7-B466-021A9DCB9D5C}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{315E3C60-A5D9-4F47-A940-D57395EED606} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F9097917-AFA3-4E3E-A592-BFA2C483C7E2} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2E88FB02-CE53-4D6E-8D60-CDCD578E1871}
+		SolutionGuid = {9205DA5F-88A2-4045-9B31-9CC53CCF7550}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
index ba70507898a775..c3a8075c8db72d 100644
--- a/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
+++ b/src/libraries/System.Runtime.Loader/System.Runtime.Loader.sln
@@ -1,150 +1,411 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Tests", "tests\System.Runtime.Loader.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.ContextualReflectionDependency", "tests\ContextualReflectionDependency\System.Runtime.Loader.Test.ContextualReflectionDependency.csproj", "{95DBE3B0-AA86-4366-BB8A-E04B534365F3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.DefaultContext.Tests", "tests\DefaultContext\System.Runtime.Loader.DefaultContext.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.RefEmitLoadContext.Tests", "tests\RefEmitLoadContext\System.Runtime.Loader.RefEmitLoadContext.Tests.csproj", "{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferencedClassLib", "tests\ReferencedClassLib\ReferencedClassLib.csproj", "{2CD5A44C-65B4-4C51-AC7B-B2938307848A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferencedClassLibNeutralIsSatellite", "tests\ReferencedClassLibNeutralIsSatellite\ReferencedClassLibNeutralIsSatellite.csproj", "{7FA764E6-47A3-42B5-923B-7D5DBC611E8E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Noop.Assembly", "tests\System.Runtime.Loader.Noop.Assembly\System.Runtime.Loader.Noop.Assembly.csproj", "{396D6EBF-60BD-4DAF-8783-FB403E070A57}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.Assembly", "tests\System.Runtime.Loader.Test.Assembly\System.Runtime.Loader.Test.Assembly.csproj", "{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.Assembly2", "tests\System.Runtime.Loader.Test.Assembly2\System.Runtime.Loader.Test.Assembly2.csproj", "{FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.AssemblyNotSupported", "tests\System.Runtime.Loader.Test.AssemblyNotSupported\System.Runtime.Loader.Test.AssemblyNotSupported.csproj", "{F430F54A-7F28-4707-8006-F628B576664E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {485A65F0-51C9-4B95-A7A8-A4860C231E67}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader", "src\System.Runtime.Loader.csproj", "{485A65F0-51C9-4B95-A7A8-A4860C231E67}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FB507A82-ACDD-4809-A030-6F9372A71194} = {FB507A82-ACDD-4809-A030-6F9372A71194}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader", "ref\System.Runtime.Loader.csproj", "{FB507A82-ACDD-4809-A030-6F9372A71194}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{074D2005-2DD1-4BD4-AAAF-B989C2D5B959}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E046E80F-B18A-463E-82D3-9755F9F8D8E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{8D19CD03-08EE-4574-B798-C658502C0A42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader", "ref\System.Runtime.Loader.csproj", "{95B66B14-BCC7-407A-930C-4B34D4F7EC98}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader", "src\System.Runtime.Loader.csproj", "{B8F22D73-B183-4F17-9D5E-04B80699E56A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.ContextualReflectionDependency", "tests\ContextualReflectionDependency\System.Runtime.Loader.Test.ContextualReflectionDependency.csproj", "{76BE0621-CDAD-4808-8537-ADC9F028286B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.DefaultContext.Tests", "tests\DefaultContext\System.Runtime.Loader.DefaultContext.Tests.csproj", "{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoaderLinkTest.Dynamic", "tests\LoaderLinkTest.Dynamic\LoaderLinkTest.Dynamic.csproj", "{78BC94E5-2E23-40EF-863E-52AFCE838C96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoaderLinkTest.Shared", "tests\LoaderLinkTest.Shared\LoaderLinkTest.Shared.csproj", "{7E785A7B-6ED6-4459-A07D-28DE1830C186}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.RefEmitLoadContext.Tests", "tests\RefEmitLoadContext\System.Runtime.Loader.RefEmitLoadContext.Tests.csproj", "{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferencedClassLib", "tests\ReferencedClassLib\ReferencedClassLib.csproj", "{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReferencedClassLibNeutralIsSatellite", "tests\ReferencedClassLibNeutralIsSatellite\ReferencedClassLibNeutralIsSatellite.csproj", "{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Noop.Assembly", "tests\System.Runtime.Loader.Noop.Assembly\System.Runtime.Loader.Noop.Assembly.csproj", "{44B22827-B9F0-4ADC-969C-7EC647D0B82A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.Assembly", "tests\System.Runtime.Loader.Test.Assembly\System.Runtime.Loader.Test.Assembly.csproj", "{49B0A873-5834-45A4-9495-E1063005CB82}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.Assembly2", "tests\System.Runtime.Loader.Test.Assembly2\System.Runtime.Loader.Test.Assembly2.csproj", "{E60DD367-D1D7-4F6C-919B-DC68E8445E97}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Test.AssemblyNotSupported", "tests\System.Runtime.Loader.Test.AssemblyNotSupported\System.Runtime.Loader.Test.AssemblyNotSupported.csproj", "{9AD657ED-396B-4BE7-BCB6-BCA130825418}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Loader.Tests", "tests\System.Runtime.Loader.Tests.csproj", "{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2AA50D1B-FD91-4748-85CF-33B2D265EBF6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{C573CBE3-41F5-400D-A212-34889236C09C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{52AEFCDE-2CD8-4DE0-91DA-2B0B2AC32FD0}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558} = {2AA50D1B-FD91-4748-85CF-33B2D265EBF6}
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C} = {2AA50D1B-FD91-4748-85CF-33B2D265EBF6}
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A} = {2AA50D1B-FD91-4748-85CF-33B2D265EBF6}
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{76BE0621-CDAD-4808-8537-ADC9F028286B} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{49B0A873-5834-45A4-9495-E1063005CB82} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562} = {C573CBE3-41F5-400D-A212-34889236C09C}
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9} = {52AEFCDE-2CD8-4DE0-91DA-2B0B2AC32FD0}
+		{8D19CD03-08EE-4574-B798-C658502C0A42} = {52AEFCDE-2CD8-4DE0-91DA-2B0B2AC32FD0}
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98} = {52AEFCDE-2CD8-4DE0-91DA-2B0B2AC32FD0}
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1} = {52AEFCDE-2CD8-4DE0-91DA-2B0B2AC32FD0}
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F} = {52AEFCDE-2CD8-4DE0-91DA-2B0B2AC32FD0}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95DBE3B0-AA86-4366-BB8A-E04B534365F3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2CD5A44C-65B4-4C51-AC7B-B2938307848A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7FA764E6-47A3-42B5-923B-7D5DBC611E8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{396D6EBF-60BD-4DAF-8783-FB403E070A57}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBF73A8E-7889-4C7D-AFC3-509B821D0FC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F430F54A-7F28-4707-8006-F628B576664E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F430F54A-7F28-4707-8006-F628B576664E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F430F54A-7F28-4707-8006-F628B576664E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F430F54A-7F28-4707-8006-F628B576664E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB507A82-ACDD-4809-A030-6F9372A71194}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB507A82-ACDD-4809-A030-6F9372A71194}.Release|Any CPU.Build.0 = Release|Any CPU
-		{074D2005-2DD1-4BD4-AAAF-B989C2D5B959}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{074D2005-2DD1-4BD4-AAAF-B989C2D5B959}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{074D2005-2DD1-4BD4-AAAF-B989C2D5B959}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{074D2005-2DD1-4BD4-AAAF-B989C2D5B959}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Debug|Any CPU.Build.0 = Debug|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Debug|x64.ActiveCfg = Debug|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Debug|x64.Build.0 = Debug|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Debug|x86.ActiveCfg = Debug|x86
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Debug|x86.Build.0 = Debug|x86
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Release|Any CPU.ActiveCfg = Release|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Release|Any CPU.Build.0 = Release|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Release|x64.ActiveCfg = Release|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Release|x64.Build.0 = Release|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Release|x86.ActiveCfg = Release|x86
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Release|x86.Build.0 = Release|x86
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Checked|Any CPU.Build.0 = Checked|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Checked|x64.ActiveCfg = Checked|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Checked|x64.Build.0 = Checked|x64
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Checked|x86.ActiveCfg = Checked|x86
+		{64DDD2AF-BF90-4DD8-AC24-D2084DB8D558}.Checked|x86.Build.0 = Checked|x86
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Release|x64.Build.0 = Release|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Release|x86.Build.0 = Release|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D6D16FFD-FD76-4700-B456-1DC4D093D1B5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Debug|x64.Build.0 = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Debug|x86.Build.0 = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Release|x64.ActiveCfg = Release|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Release|x64.Build.0 = Release|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Release|x86.ActiveCfg = Release|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Release|x86.Build.0 = Release|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E046E80F-B18A-463E-82D3-9755F9F8D8E9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x64.Build.0 = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Debug|x86.Build.0 = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x64.ActiveCfg = Release|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x64.Build.0 = Release|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x86.ActiveCfg = Release|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Release|x86.Build.0 = Release|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8D19CD03-08EE-4574-B798-C658502C0A42}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Debug|x64.Build.0 = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Debug|x86.Build.0 = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Release|x64.ActiveCfg = Release|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Release|x64.Build.0 = Release|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Release|x86.ActiveCfg = Release|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Release|x86.Build.0 = Release|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{074F38DA-36E1-4D2A-AEE6-3F783639ED9C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Debug|x64.Build.0 = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Debug|x86.Build.0 = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Release|x64.ActiveCfg = Release|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Release|x64.Build.0 = Release|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Release|x86.ActiveCfg = Release|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Release|x86.Build.0 = Release|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{95B66B14-BCC7-407A-930C-4B34D4F7EC98}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Debug|x86.Build.0 = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Release|x64.Build.0 = Release|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Release|x86.Build.0 = Release|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B8F22D73-B183-4F17-9D5E-04B80699E56A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Debug|x64.Build.0 = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Debug|x86.Build.0 = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Release|x64.ActiveCfg = Release|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Release|x64.Build.0 = Release|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Release|x86.ActiveCfg = Release|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Release|x86.Build.0 = Release|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{76BE0621-CDAD-4808-8537-ADC9F028286B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Release|x64.Build.0 = Release|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Release|x86.Build.0 = Release|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8EB6F6F0-FD8C-44C8-A9D8-18854C3C2159}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Debug|x64.Build.0 = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Debug|x86.Build.0 = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Release|x64.ActiveCfg = Release|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Release|x64.Build.0 = Release|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Release|x86.ActiveCfg = Release|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Release|x86.Build.0 = Release|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{78BC94E5-2E23-40EF-863E-52AFCE838C96}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Debug|x64.Build.0 = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Debug|x86.Build.0 = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Release|x64.ActiveCfg = Release|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Release|x64.Build.0 = Release|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Release|x86.ActiveCfg = Release|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Release|x86.Build.0 = Release|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7E785A7B-6ED6-4459-A07D-28DE1830C186}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Debug|x64.Build.0 = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Debug|x86.Build.0 = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Release|x64.ActiveCfg = Release|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Release|x64.Build.0 = Release|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Release|x86.ActiveCfg = Release|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Release|x86.Build.0 = Release|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F0CEA7EB-E8B5-482A-AB6C-3E12992F2902}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Debug|x64.Build.0 = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Debug|x86.Build.0 = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Release|x64.ActiveCfg = Release|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Release|x64.Build.0 = Release|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Release|x86.ActiveCfg = Release|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Release|x86.Build.0 = Release|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CA8B6E49-5EAF-4B7C-A141-6D83DD8D8AFD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Debug|x64.Build.0 = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Debug|x86.Build.0 = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Release|x64.ActiveCfg = Release|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Release|x64.Build.0 = Release|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Release|x86.ActiveCfg = Release|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Release|x86.Build.0 = Release|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{10699CE6-A1B3-4C14-93E0-CB5CF3292BDD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Debug|x64.Build.0 = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Debug|x86.Build.0 = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Release|x64.ActiveCfg = Release|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Release|x64.Build.0 = Release|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Release|x86.ActiveCfg = Release|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Release|x86.Build.0 = Release|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{44B22827-B9F0-4ADC-969C-7EC647D0B82A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Debug|x64.Build.0 = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Debug|x86.Build.0 = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Release|x64.ActiveCfg = Release|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Release|x64.Build.0 = Release|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Release|x86.ActiveCfg = Release|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Release|x86.Build.0 = Release|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{49B0A873-5834-45A4-9495-E1063005CB82}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Debug|x64.Build.0 = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Debug|x86.Build.0 = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Release|x64.ActiveCfg = Release|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Release|x64.Build.0 = Release|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Release|x86.ActiveCfg = Release|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Release|x86.Build.0 = Release|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E60DD367-D1D7-4F6C-919B-DC68E8445E97}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Debug|x64.Build.0 = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Debug|x86.Build.0 = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Release|x64.ActiveCfg = Release|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Release|x64.Build.0 = Release|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Release|x86.ActiveCfg = Release|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Release|x86.Build.0 = Release|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9AD657ED-396B-4BE7-BCB6-BCA130825418}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Debug|x64.Build.0 = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Debug|x86.Build.0 = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Release|x64.ActiveCfg = Release|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Release|x64.Build.0 = Release|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Release|x86.ActiveCfg = Release|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Release|x86.Build.0 = Release|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{29E02AA9-E3D5-400C-B2C5-970B6E6D8562}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Debug|x64.Build.0 = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Debug|x86.Build.0 = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Release|x64.ActiveCfg = Release|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Release|x64.Build.0 = Release|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Release|x86.ActiveCfg = Release|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Release|x86.Build.0 = Release|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E38F7C05-A856-47AF-B210-5FE1EDB1DBF1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Release|x64.ActiveCfg = Release|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Release|x64.Build.0 = Release|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Release|x86.Build.0 = Release|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9D650A86-9EB5-41E6-89CE-B2A302D4F33F}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{95DBE3B0-AA86-4366-BB8A-E04B534365F3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A8} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{701CB3BC-00DC-435D-BDE4-C5FC29A708A9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2CD5A44C-65B4-4C51-AC7B-B2938307848A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7FA764E6-47A3-42B5-923B-7D5DBC611E8E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{396D6EBF-60BD-4DAF-8783-FB403E070A57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E3C33774-AA3D-4CED-A7A6-BDF9A7F100DF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{FBF73A8E-7889-4C7D-AFC3-509B821D0FC6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F430F54A-7F28-4707-8006-F628B576664E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{485A65F0-51C9-4B95-A7A8-A4860C231E67} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{FB507A82-ACDD-4809-A030-6F9372A71194} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{074D2005-2DD1-4BD4-AAAF-B989C2D5B959} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8A93F75F-A61A-4F0E-9929-65775CFDEB09}
+		SolutionGuid = {73D0667D-A181-41CA-B57B-DD177166E019}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
index d083e77ca7723c..adce0f09367a46 100644
--- a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
+++ b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.Tests", "tests\System.Runtime.Numerics.Tests.csproj", "{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} = {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics", "src\System.Runtime.Numerics.csproj", "{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F} = {7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{34316210-AAA4-41F1-A1A8-16AFB34661F3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics", "ref\System.Runtime.Numerics.csproj", "{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B6DD0576-19F7-4217-8C41-0D113942CC38}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics", "ref\System.Runtime.Numerics.csproj", "{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics", "src\System.Runtime.Numerics.csproj", "{91F8FBEF-C085-4542-BEE4-22449D80734A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{29DB89CE-C72E-48B2-8693-A28835E5A43A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.Tests", "tests\System.Runtime.Numerics.Tests.csproj", "{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{36AE25D3-FA7A-451D-AD9B-65C16B323CD6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{00A8E1F2-9AA9-4925-96E4-F6F78ADF5555}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{048140C9-4475-425A-BC25-3F2B7BF0C45A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DEFFBE8C-356B-4E32-B11F-AF49B913495E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{88AAF1A7-4CB6-45C9-BE95-CB0645193061}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A22876CA-76C0-4ABD-8658-C2B3DFDFE537} = {048140C9-4475-425A-BC25-3F2B7BF0C45A}
+		{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC} = {048140C9-4475-425A-BC25-3F2B7BF0C45A}
+		{34316210-AAA4-41F1-A1A8-16AFB34661F3} = {DEFFBE8C-356B-4E32-B11F-AF49B913495E}
+		{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2} = {DEFFBE8C-356B-4E32-B11F-AF49B913495E}
+		{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3} = {DEFFBE8C-356B-4E32-B11F-AF49B913495E}
+		{36AE25D3-FA7A-451D-AD9B-65C16B323CD6} = {DEFFBE8C-356B-4E32-B11F-AF49B913495E}
+		{00A8E1F2-9AA9-4925-96E4-F6F78ADF5555} = {DEFFBE8C-356B-4E32-B11F-AF49B913495E}
+		{B6DD0576-19F7-4217-8C41-0D113942CC38} = {88AAF1A7-4CB6-45C9-BE95-CB0645193061}
+		{91F8FBEF-C085-4542-BEE4-22449D80734A} = {88AAF1A7-4CB6-45C9-BE95-CB0645193061}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28AE24F8-BEF4-4358-B612-ADD9D587C8E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29DB89CE-C72E-48B2-8693-A28835E5A43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{29DB89CE-C72E-48B2-8693-A28835E5A43A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29DB89CE-C72E-48B2-8693-A28835E5A43A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{29DB89CE-C72E-48B2-8693-A28835E5A43A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A22876CA-76C0-4ABD-8658-C2B3DFDFE537}.Release|Any CPU.Build.0 = Release|Any CPU
+		{34316210-AAA4-41F1-A1A8-16AFB34661F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{34316210-AAA4-41F1-A1A8-16AFB34661F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{34316210-AAA4-41F1-A1A8-16AFB34661F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{34316210-AAA4-41F1-A1A8-16AFB34661F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54B39B17-A2BB-4D34-8AC4-4F59BC73C0F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6DD0576-19F7-4217-8C41-0D113942CC38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6DD0576-19F7-4217-8C41-0D113942CC38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6DD0576-19F7-4217-8C41-0D113942CC38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6DD0576-19F7-4217-8C41-0D113942CC38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C91AC3B4-647B-4D7F-83CA-BE90FFFC8CF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91F8FBEF-C085-4542-BEE4-22449D80734A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91F8FBEF-C085-4542-BEE4-22449D80734A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91F8FBEF-C085-4542-BEE4-22449D80734A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91F8FBEF-C085-4542-BEE4-22449D80734A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C4CBA2D-4C9D-4B83-85A4-2DF75C91B0FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36AE25D3-FA7A-451D-AD9B-65C16B323CD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36AE25D3-FA7A-451D-AD9B-65C16B323CD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36AE25D3-FA7A-451D-AD9B-65C16B323CD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36AE25D3-FA7A-451D-AD9B-65C16B323CD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A8E1F2-9AA9-4925-96E4-F6F78ADF5555}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A8E1F2-9AA9-4925-96E4-F6F78ADF5555}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A8E1F2-9AA9-4925-96E4-F6F78ADF5555}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A8E1F2-9AA9-4925-96E4-F6F78ADF5555}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{28AE24F8-BEF4-4358-B612-ADD9D587C8E1} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7D5CBF2F-337C-4AEB-B035-A17D33A9BC1F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{29DB89CE-C72E-48B2-8693-A28835E5A43A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0CD1D1F8-4171-43E2-9ABF-75B20AD94549}
+		SolutionGuid = {B7C7E4C6-78B9-4AE7-AC8B-4F08EAD0DECB}
 	EndGlobalSection
 EndGlobal
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 f54e3286fc685a..4afbab31c93f42 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
@@ -1,88 +1,1041 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Formatters.Tests", "tests\System.Runtime.Serialization.Formatters.Tests.csproj", "{13CE5E71-D373-4EA6-B3CB-166FF089A42A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CF80D24A-787A-43DB-B9E7-10BCA02D10EA} = {CF80D24A-787A-43DB-B9E7-10BCA02D10EA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{096171D9-C978-4509-B9D3-B6DBCD78420D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Formatters", "src\System.Runtime.Serialization.Formatters.csproj", "{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4413B319-3D48-4516-A45B-375F4650EF0D} = {4413B319-3D48-4516-A45B-375F4650EF0D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Formatters", "ref\System.Runtime.Serialization.Formatters.csproj", "{4413B319-3D48-4516-A45B-375F4650EF0D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{CDB167D4-7675-441B-9176-D2491BF72B51}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{D0E065A2-7569-4F40-8D3C-7889BA1A3006}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A4F5FC3B-5BD1-4481-972B-19165AF540FB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{6B34282C-D54D-44F2-B40F-04E6E0F054CB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{1899F2A2-A3E4-41EF-8180-4F11795ABDC6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\ref\System.CodeDom.csproj", "{A1BEF14B-0C13-4854-8299-DADF0D1181D9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{19ADDB12-418C-49F2-A07D-FAC40C2EB36D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\src\System.CodeDom.csproj", "{FA9FDA97-57C2-421C-A578-EEB0B600A412}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent", "..\System.Collections.Concurrent\src\System.Collections.Concurrent.csproj", "{493FB31F-9003-4BA7-85F7-E68CC28E6EE4}"
+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.NonGeneric", "..\System.Collections.NonGeneric\src\System.Collections.NonGeneric.csproj", "{93D8A5A0-18AA-47D3-9729-5BFFD56EC00C}"
+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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections", "..\System.Collections\src\System.Collections.csproj", "{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "..\System.ComponentModel.Composition\ref\System.ComponentModel.Composition.csproj", "{C9142466-56E3-412F-AD42-FF5CF05D8DB1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.Composition", "..\System.ComponentModel.Composition\src\System.ComponentModel.Composition.csproj", "{14C1E145-621A-496F-AC3D-DCDF116C8AD9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\ref\System.Configuration.ConfigurationManager.csproj", "{35B1EF33-126D-4769-B593-14DDDD630AB2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Configuration.ConfigurationManager", "..\System.Configuration.ConfigurationManager\src\System.Configuration.ConfigurationManager.csproj", "{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "..\System.Data.Odbc\ref\System.Data.Odbc.csproj", "{80DC7480-77B6-4D7D-AE6A-AA31366D2055}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Data.Odbc", "..\System.Data.Odbc\src\System.Data.Odbc.csproj", "{5F31A880-2571-46BC-AD68-D0896F613570}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{28BA346E-BF18-45AF-B0D2-15A5969F7975}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{A472E78C-3184-480F-97F2-6B89A10E1A87}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Tracing", "..\System.Diagnostics.Tracing\src\System.Diagnostics.Tracing.csproj", "{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "..\System.DirectoryServices.AccountManagement\ref\System.DirectoryServices.AccountManagement.csproj", "{8307AA11-40DC-44AD-8F0E-567923BDC752}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.AccountManagement", "..\System.DirectoryServices.AccountManagement\src\System.DirectoryServices.AccountManagement.csproj", "{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\ref\System.DirectoryServices.Protocols.csproj", "{1A591DF1-D797-4820-BC9A-6060B1444213}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices.Protocols", "..\System.DirectoryServices.Protocols\src\System.DirectoryServices.Protocols.csproj", "{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{61914172-8197-4E04-9CE7-82C25D0AC8F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{9E471AE8-A165-4B32-8603-2BABD02A0664}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{4E423476-3653-402A-AD55-0E5111A96ACC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{D3535D48-5700-4DB1-AEED-494650BAB175}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{191A0C1D-9182-4729-BC29-F594E8552E7A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "..\System.IO.Packaging\ref\System.IO.Packaging.csproj", "{6F5E7FFC-8709-4072-B0B3-404BEB517394}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Packaging", "..\System.IO.Packaging\src\System.IO.Packaging.csproj", "{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}"
+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\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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Formatters", "ref\System.Runtime.Serialization.Formatters.csproj", "{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Formatters", "src\System.Runtime.Serialization.Formatters.csproj", "{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Formatters.Tests", "tests\System.Runtime.Serialization.Formatters.Tests.csproj", "{3D4DD468-10FE-4606-BA10-F848447AF157}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "..\System.Runtime\src\System.Runtime.csproj", "{711CBCE0-C21C-45DA-B0D2-D2298941058E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BD9F8763-8B14-447C-916C-E662DA536586}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\ref\System.Security.Cryptography.ProtectedData.csproj", "{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "..\System.Security.Cryptography.ProtectedData\src\System.Security.Cryptography.ProtectedData.csproj", "{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{143DCF72-7DD7-4365-8B47-D67010F662A1}"
+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.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F4D16881-60E6-46F8-B5A7-D363CCA72B16}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}"
+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.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\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}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{E92F7B7A-D34D-49B8-8857-09936624E038}"
+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", "{9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E992B3E6-BBE0-42E2-803F-0DB171BCA30A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F0EFC835-6185-430D-84E0-B3E01930A148}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{096171D9-C978-4509-B9D3-B6DBCD78420D} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{CDB167D4-7675-441B-9176-D2491BF72B51} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{82E81182-3C80-40A9-978A-4152461F4FE4} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{81F58927-6022-4DD7-9E78-BDD3DA309285} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{86557424-C2F0-4554-808F-4429FCEE1E9A} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{5F31A880-2571-46BC-AD68-D0896F613570} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{A472E78C-3184-480F-97F2-6B89A10E1A87} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{9E471AE8-A165-4B32-8603-2BABD02A0664} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{D3535D48-5700-4DB1-AEED-494650BAB175} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{191A0C1D-9182-4729-BC29-F594E8552E7A} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{79F35586-A12D-4831-9D9D-5134FF07CC41} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{B6953324-8866-4D94-B352-20EF38EA6774} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7} = {9AEC194E-B6A2-4E6F-AFFB-BE3CEA94BB43}
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6} = {E992B3E6-BBE0-42E2-803F-0DB171BCA30A}
+		{3D4DD468-10FE-4606-BA10-F848447AF157} = {E992B3E6-BBE0-42E2-803F-0DB171BCA30A}
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{35B1EF33-126D-4769-B593-14DDDD630AB2} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{8307AA11-40DC-44AD-8F0E-567923BDC752} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{1A591DF1-D797-4820-BC9A-6060B1444213} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{4E423476-3653-402A-AD55-0E5111A96ACC} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{BD9F8763-8B14-447C-916C-E662DA536586} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{143DCF72-7DD7-4365-8B47-D67010F662A1} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+		{E92F7B7A-D34D-49B8-8857-09936624E038} = {F0EFC835-6185-430D-84E0-B3E01930A148}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13CE5E71-D373-4EA6-B3CB-166FF089A42A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF80D24A-787A-43DB-B9E7-10BCA02D10EA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4413B319-3D48-4516-A45B-375F4650EF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4413B319-3D48-4516-A45B-375F4650EF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4413B319-3D48-4516-A45B-375F4650EF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4413B319-3D48-4516-A45B-375F4650EF0D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A4F5FC3B-5BD1-4481-972B-19165AF540FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A4F5FC3B-5BD1-4481-972B-19165AF540FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A4F5FC3B-5BD1-4481-972B-19165AF540FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A4F5FC3B-5BD1-4481-972B-19165AF540FB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1899F2A2-A3E4-41EF-8180-4F11795ABDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1899F2A2-A3E4-41EF-8180-4F11795ABDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1899F2A2-A3E4-41EF-8180-4F11795ABDC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1899F2A2-A3E4-41EF-8180-4F11795ABDC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{19ADDB12-418C-49F2-A07D-FAC40C2EB36D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{19ADDB12-418C-49F2-A07D-FAC40C2EB36D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{19ADDB12-418C-49F2-A07D-FAC40C2EB36D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{19ADDB12-418C-49F2-A07D-FAC40C2EB36D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{493FB31F-9003-4BA7-85F7-E68CC28E6EE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{493FB31F-9003-4BA7-85F7-E68CC28E6EE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{493FB31F-9003-4BA7-85F7-E68CC28E6EE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{493FB31F-9003-4BA7-85F7-E68CC28E6EE4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{93D8A5A0-18AA-47D3-9729-5BFFD56EC00C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{93D8A5A0-18AA-47D3-9729-5BFFD56EC00C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{93D8A5A0-18AA-47D3-9729-5BFFD56EC00C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{93D8A5A0-18AA-47D3-9729-5BFFD56EC00C}.Release|Any CPU.Build.0 = Release|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
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Debug|x64.Build.0 = Debug|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Debug|x86.ActiveCfg = Debug|x86
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Debug|x86.Build.0 = Debug|x86
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Release|Any CPU.ActiveCfg = Release|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Release|Any CPU.Build.0 = Release|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Release|x64.ActiveCfg = Release|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Release|x64.Build.0 = Release|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Release|x86.ActiveCfg = Release|x86
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Release|x86.Build.0 = Release|x86
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Checked|Any CPU.Build.0 = Checked|x64
+		{096171D9-C978-4509-B9D3-B6DBCD78420D}.Checked|x64.ActiveCfg = Checked|x64
+		{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
+		{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
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Debug|x64.Build.0 = Debug|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Debug|x86.Build.0 = Debug|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Release|x64.ActiveCfg = Release|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Release|x64.Build.0 = Release|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Release|x86.ActiveCfg = Release|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Release|x86.Build.0 = Release|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{25F48B11-0D57-47B7-88EE-7D407AFBA7B6}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{8EEDE19C-274E-4C36-BCA6-F75F32095BD0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Debug|x64.Build.0 = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Debug|x86.Build.0 = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Release|x64.ActiveCfg = Release|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Release|x64.Build.0 = Release|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Release|x86.ActiveCfg = Release|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Release|x86.Build.0 = Release|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B8EBC038-24C4-480C-9B17-CCB39AFAEC05}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Debug|x64.Build.0 = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Debug|x86.Build.0 = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Release|x64.Build.0 = Release|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Release|x86.Build.0 = Release|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CDB167D4-7675-441B-9176-D2491BF72B51}.Checked|x86.ActiveCfg = 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
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Debug|x64.Build.0 = Debug|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Debug|x86.Build.0 = Debug|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Release|x64.ActiveCfg = Release|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Release|x64.Build.0 = Release|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Release|x86.ActiveCfg = Release|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Release|x86.Build.0 = Release|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D0E065A2-7569-4F40-8D3C-7889BA1A3006}.Checked|x86.ActiveCfg = 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
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Debug|x64.Build.0 = Debug|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Debug|x86.Build.0 = Debug|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Release|x64.ActiveCfg = Release|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Release|x64.Build.0 = Release|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Release|x86.Build.0 = Release|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6B34282C-D54D-44F2-B40F-04E6E0F054CB}.Checked|x86.ActiveCfg = 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
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Release|x64.Build.0 = Release|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Release|x86.Build.0 = Release|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A1BEF14B-0C13-4854-8299-DADF0D1181D9}.Checked|x86.ActiveCfg = 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
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Release|x64.Build.0 = Release|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Release|x86.Build.0 = Release|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FA9FDA97-57C2-421C-A578-EEB0B600A412}.Checked|x86.ActiveCfg = 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
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Debug|x64.Build.0 = Debug|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Debug|x86.Build.0 = Debug|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Release|x64.ActiveCfg = Release|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Release|x64.Build.0 = Release|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Release|x86.ActiveCfg = Release|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Release|x86.Build.0 = Release|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82E81182-3C80-40A9-978A-4152461F4FE4}.Checked|x86.ActiveCfg = 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
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Debug|x64.Build.0 = Debug|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Debug|x86.Build.0 = Debug|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Release|x64.ActiveCfg = Release|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Release|x64.Build.0 = Release|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Release|x86.ActiveCfg = Release|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Release|x86.Build.0 = Release|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{81F58927-6022-4DD7-9E78-BDD3DA309285}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Debug|x64.Build.0 = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Debug|x86.Build.0 = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Release|x64.ActiveCfg = Release|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Release|x64.Build.0 = Release|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Release|x86.ActiveCfg = Release|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Release|x86.Build.0 = Release|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{86557424-C2F0-4554-808F-4429FCEE1E9A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|x64.Build.0 = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Debug|x86.Build.0 = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Release|x64.ActiveCfg = Release|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Release|x64.Build.0 = Release|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Release|x86.ActiveCfg = Release|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Release|x86.Build.0 = Release|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2605A8EE-CFEF-4A57-8A94-2C2B95E770E3}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{C9142466-56E3-412F-AD42-FF5CF05D8DB1}.Checked|x86.ActiveCfg = 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
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Debug|x64.Build.0 = Debug|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Debug|x86.Build.0 = Debug|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Release|x64.ActiveCfg = Release|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Release|x64.Build.0 = Release|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Release|x86.ActiveCfg = Release|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Release|x86.Build.0 = Release|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{14C1E145-621A-496F-AC3D-DCDF116C8AD9}.Checked|x86.ActiveCfg = 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
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Debug|x64.Build.0 = Debug|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Debug|x86.Build.0 = Debug|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Release|x64.ActiveCfg = Release|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Release|x64.Build.0 = Release|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Release|x86.ActiveCfg = Release|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Release|x86.Build.0 = Release|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{35B1EF33-126D-4769-B593-14DDDD630AB2}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{EADF56B3-6BC6-4B67-BA47-DD22630AFD53}.Checked|x86.ActiveCfg = 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
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Debug|x64.Build.0 = Debug|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Debug|x86.Build.0 = Debug|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Release|x64.ActiveCfg = Release|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Release|x64.Build.0 = Release|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Release|x86.ActiveCfg = Release|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Release|x86.Build.0 = Release|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{80DC7480-77B6-4D7D-AE6A-AA31366D2055}.Checked|x86.ActiveCfg = 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
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Debug|x64.Build.0 = Debug|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Debug|x86.Build.0 = Debug|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Release|x64.ActiveCfg = Release|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Release|x64.Build.0 = Release|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Release|x86.ActiveCfg = Release|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Release|x86.Build.0 = Release|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5F31A880-2571-46BC-AD68-D0896F613570}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{28BA346E-BF18-45AF-B0D2-15A5969F7975}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{A472E78C-3184-480F-97F2-6B89A10E1A87}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{C0E8A6B4-DC57-434B-ABB0-500F6DE352A8}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{8307AA11-40DC-44AD-8F0E-567923BDC752}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{6332FDA4-65E5-484D-B1D5-D9B23EDDAEB3}.Checked|x86.ActiveCfg = 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
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Debug|x64.Build.0 = Debug|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Debug|x86.Build.0 = Debug|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Release|x64.ActiveCfg = Release|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Release|x64.Build.0 = Release|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Release|x86.ActiveCfg = Release|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Release|x86.Build.0 = Release|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1A591DF1-D797-4820-BC9A-6060B1444213}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{DB2FF5FA-16B3-4A4B-9207-3D4622CD23E0}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{61914172-8197-4E04-9CE7-82C25D0AC8F2}.Checked|x86.ActiveCfg = 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
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Debug|x64.Build.0 = Debug|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Debug|x86.Build.0 = Debug|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Release|x64.ActiveCfg = Release|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Release|x64.Build.0 = Release|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Release|x86.ActiveCfg = Release|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Release|x86.Build.0 = Release|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9E471AE8-A165-4B32-8603-2BABD02A0664}.Checked|x86.ActiveCfg = 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
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Debug|x86.Build.0 = Debug|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Release|x64.Build.0 = Release|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Release|x86.ActiveCfg = Release|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Release|x86.Build.0 = Release|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4E423476-3653-402A-AD55-0E5111A96ACC}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{D3535D48-5700-4DB1-AEED-494650BAB175}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Debug|x64.Build.0 = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Debug|x86.Build.0 = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Release|x64.ActiveCfg = Release|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Release|x64.Build.0 = Release|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Release|x86.ActiveCfg = Release|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Release|x86.Build.0 = Release|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6704AB83-3F1D-4C99-A184-F8A09A9C5AD9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Debug|x64.Build.0 = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Debug|x86.Build.0 = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Release|x64.ActiveCfg = Release|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Release|x64.Build.0 = Release|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Release|x86.ActiveCfg = Release|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Release|x86.Build.0 = Release|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{191A0C1D-9182-4729-BC29-F594E8552E7A}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{6F5E7FFC-8709-4072-B0B3-404BEB517394}.Checked|x86.ActiveCfg = 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
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Debug|x64.Build.0 = Debug|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Debug|x86.Build.0 = Debug|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Release|x64.ActiveCfg = Release|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Release|x64.Build.0 = Release|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Release|x86.Build.0 = Release|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AE592E1E-C5DB-4F81-AD45-31F2F1A6A75B}.Checked|x86.ActiveCfg = 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
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Debug|x64.Build.0 = Debug|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Debug|x86.Build.0 = Debug|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Release|x64.ActiveCfg = Release|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Release|x64.Build.0 = Release|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Release|x86.ActiveCfg = Release|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Release|x86.Build.0 = Release|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1E395137-871B-4D6F-A7DB-C92850FAB0D3}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{79F35586-A12D-4831-9D9D-5134FF07CC41}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Debug|x86.Build.0 = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x64.Build.0 = Release|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Release|x86.Build.0 = Release|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E5511CF3-A800-4B9E-B25F-919D6F86B2D9}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{4BFED8CA-1221-48EE-8229-BDB8951DB1C7}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{C1D7364E-C24B-460E-B0A0-E49BA6D9FFEC}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{5944056C-E7A1-4A10-BAC4-E3AF91C12C5C}.Checked|x86.ActiveCfg = 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
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Debug|x64.Build.0 = Debug|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Debug|x86.Build.0 = Debug|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Release|x64.ActiveCfg = Release|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Release|x64.Build.0 = Release|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Release|x86.ActiveCfg = Release|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Release|x86.Build.0 = Release|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3D4DD468-10FE-4606-BA10-F848447AF157}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{711CBCE0-C21C-45DA-B0D2-D2298941058E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Debug|x64.Build.0 = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Debug|x86.Build.0 = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Release|x64.ActiveCfg = Release|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Release|x64.Build.0 = Release|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Release|x86.ActiveCfg = Release|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Release|x86.Build.0 = Release|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BD9F8763-8B14-447C-916C-E662DA536586}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Debug|x64.Build.0 = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Debug|x86.Build.0 = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Release|x64.ActiveCfg = Release|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Release|x64.Build.0 = Release|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Release|x86.ActiveCfg = Release|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Release|x86.Build.0 = Release|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6E5ED228-5329-4F01-A7C2-E3C70B2C6352}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Release|x64.Build.0 = Release|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Release|x86.Build.0 = Release|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CBE6BB10-0C9C-4620-8F49-A5BF4476B3D7}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{DF679A1A-1797-40EB-A8AA-E3AEA66C80E5}.Checked|x86.ActiveCfg = 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
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Debug|x86.Build.0 = Debug|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Release|x64.Build.0 = Release|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Release|x86.Build.0 = Release|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{143DCF72-7DD7-4365-8B47-D67010F662A1}.Checked|x86.ActiveCfg = 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
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Debug|x64.Build.0 = Debug|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Debug|x86.Build.0 = Debug|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Release|x64.ActiveCfg = Release|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Release|x64.Build.0 = Release|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Release|x86.ActiveCfg = Release|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Release|x86.Build.0 = Release|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3EA84883-E564-483D-A44E-FF1CC947B7A0}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Release|x64.Build.0 = Release|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Release|x86.Build.0 = Release|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F4D16881-60E6-46F8-B5A7-D363CCA72B16}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Debug|x64.Build.0 = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Debug|x86.Build.0 = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Release|x64.ActiveCfg = Release|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Release|x64.Build.0 = Release|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Release|x86.ActiveCfg = Release|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Release|x86.Build.0 = Release|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C67F64C1-32B1-4EDF-A814-DEF475CDCEC2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Debug|x64.Build.0 = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Debug|x86.Build.0 = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Release|x64.ActiveCfg = Release|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Release|x64.Build.0 = Release|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Release|x86.ActiveCfg = Release|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Release|x86.Build.0 = Release|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7913F002-64DC-43C6-9D74-B0B9BA297F00}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{26B82FDC-3524-4DAF-91E3-F5BA9F903906}.Checked|x86.ActiveCfg = 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
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Debug|x86.Build.0 = Debug|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Release|x64.Build.0 = Release|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Release|x86.ActiveCfg = Release|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Release|x86.Build.0 = Release|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B6953324-8866-4D94-B352-20EF38EA6774}.Checked|x86.ActiveCfg = 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
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Debug|x64.Build.0 = Debug|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Debug|x86.Build.0 = Debug|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Release|x64.ActiveCfg = Release|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Release|x64.Build.0 = Release|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Release|x86.ActiveCfg = Release|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Release|x86.Build.0 = Release|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0A103F2A-2FF6-4291-AB51-203E5CA00B2D}.Checked|x86.ActiveCfg = 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
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Debug|x64.Build.0 = Debug|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Debug|x86.Build.0 = Debug|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Release|x64.ActiveCfg = Release|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Release|x64.Build.0 = Release|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Release|x86.ActiveCfg = Release|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Release|x86.Build.0 = Release|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E92F7B7A-D34D-49B8-8857-09936624E038}.Checked|x86.ActiveCfg = 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|x64.ActiveCfg = Debug|Any CPU
+		{78994C91-3A4F-4825-86C2-21FB4F082CA7}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{13CE5E71-D373-4EA6-B3CB-166FF089A42A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{CF80D24A-787A-43DB-B9E7-10BCA02D10EA} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4413B319-3D48-4516-A45B-375F4650EF0D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A4F5FC3B-5BD1-4481-972B-19165AF540FB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{1899F2A2-A3E4-41EF-8180-4F11795ABDC6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{19ADDB12-418C-49F2-A07D-FAC40C2EB36D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{493FB31F-9003-4BA7-85F7-E68CC28E6EE4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{93D8A5A0-18AA-47D3-9729-5BFFD56EC00C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7BE29712-5B4E-44A4-9A1D-DC6513B36F62}
+		SolutionGuid = {158060A0-BFF9-48E6-90A9-93F52FEB5D3B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.sln b/src/libraries/System.Runtime.Serialization.Formatters/src/System.Runtime.Serialization.Formatters.sln
new file mode 100644
index 0000000000000000000000000000000000000000..40cb9c61ff5ffb2e17a0bc0041fcaf4bb70c49ff
GIT binary patch
literal 46616
zcmd^|-EZ5-6~+0Q0{tHrc}juW@P{nR1^QrHa{90hg6(df@{+_(>TO~#>?Fum&A;CE
z{CGW~#gCC>-k~O42(l?^NFJX1F=y_O;(!11*W$8xUECDc#jW0NiVwwi#ox8=w)j}Q
zEZ*tU-?Z*yajtdO<)>?{{it<(zS5dAExju)ia(ai*V@;6ZE5?t(5Kt4Eq9B(V!PPU
z>-WX)is$7~f7X_-)%r>CxR@75#c{E#zq@L)uRU*RX{`T;S{i9-TuiidQp}12ecrlj
zKhyWe`b@h6y~f2C?d=c3^Jl#u>kNJsiVr%{dmW$SUKXE9j2HTRs`I$fci(I6E4Ai4
z9&7ENiWkLOt^1(=H#*}hEnR947ee+z`@0eD7kb;)uf@U5z4hxH^Tk>Sw{^_h;ujt5
zy7>7k-nkHubpEimqxW9P4!rD?+?|QDv6haDsal<uOCzn@(+gIQN`Cnaci3m9Gd{0b
zX_I!tPVY)j!(Yt%Ztv`OB~Cty5$uSa*0tih()Ks<34G&1{MK!<&e1FHSoDH*_R(eK
zV|o9nEO;V|jb+O%y(fy2lhVpNr6srYccL}K3T^lG{Z#fm(H6V<bnp#Y`I)SLRXi>2
zOI9Ik4QJ)Hqpxe_wtaM2`9M}0%fkDz*<NYonId<uwCG4S9hdf=D9$Ic@0Qx_$iAm)
zL%yUf-m(9U#qv=0T-S2#`F2-vbSVD!${vSEB#WNh<=d&OM&_NAcB8L4m2F0P?`aL&
z?Q0FaSg!eYsu+8z9`H($NAF3*k#B!g^u5&brM`KaAO=@EZkG*L+qx_6h^AA$$dhNX
z5c*?BR>giJ{YROgKaONMGA`}*^bN5$D>E@Y?ryd=t!tm3%1r7XckRdNvRQlUE*s6n
zHx`0#6wj7yf#x9si7#wn%Fr?=85CR6?;V!boR-$gHST^`(3+-C-%IbA%D$0Sr2qR=
z#v@8)yZA|wc&nIvqi_6e*$)re`9jF*daB=EyL{tJesLh{qJIvxOx7jOns3m99+kd<
zR-TpLPV^mqv8Pt#W4vUVZT$9QEkEA~qo_rl-0v*6%SdUCkLaCwGoECON#4NXHnwEs
zh?gAed$bo>ez)|a(=vbHQRwY_$47P6EKksfGrIYg{)bW1wiu|!>5PjRrKk6fbrE&-
z7k$sPD|^gj`I9nVSYLq;;4#PYhEbUz&;g9L$SPaPAV>0uslKOALUo^&9`$YXEUE3i
zs`c8{H7a>p#_3cnTa2D4Moo#Kr7c=fUyO56<EQG~iS3EjF+xJ8<!Xx`i+_|o<IA$L
zmPSc8kI`k5X3OpvITQ2L9~g6zCugPh!Un|1Oco$U&SVc8|FDGJPPGkIAz~&Evddm+
zWk$NFIU<nbpyuq@$K^WI`k~(V1Z&XhWNv(dDu^BX+o=wQIGu}K`Xu!1q0ZYXp`-FM
z=g;V$b#Q{3A$!3+txxnll^^;$tB$T);Y-84_5a}v`_){-Uglzeu^J;Yd<9P+lg#vj
zCwlw?Em2*u@!XksV&qN>7#@qsv06POcckHIvC16I^kIC3t><Fpxbz3}4)Q4()Z!L@
zGL=OCM~#EgE~8_ZWRy!ap6cSm6j2(U9_CMJs=pP_j6dj$&<SMCt-H9inl0<;-^h%_
z?v_5`k>pFPK%^h(Z%%Q$sMpu2YX??V^<7`vgrm>JG4n-a(__7`31dI1J>&?yn*Ig-
zNBzgvkvSMG(uz3~YJ2(Qh@pMIt)3n9Ma45bQTL<|Vh+kiSYz=Er*KPVvH1#?$UyYk
zHaA6I$8t_NW;Ne$V<)hZ-uGiipNr3_SS7FQlpfCf0a*w&XBh`O(IfIA3eaunYCL~O
zZ5Trz{APW>>E(<YsT)vVL}|j=k-Xg$2Xk@suH+h8p-e6NP=`9vR*YuOvdSi_c==HN
z9FD^rH_C%NP42Z?9;((dw2ch#TofLe9B;)Y=(|I`=wEsL|7Y#h=0TdC3}ehq;gdwU
zRXLdDA~(P~)e!Sz=0YZ7A5Be*U2QehR;a~%7+&<`)p!XW=a;G1JMLUr0gb^6e<f#-
zcf(kh`41bz9LTfDEo2>Po5aAOmYDnCZ$5TNrBB*tkD8uM=0NG0%EODPG1)u-3d61~
zqRM+LpGJvrJrSJK2H%F;hgFo)jCK}1yPXGrPmUjFF81(3X1|%2LsLw|n=OsX%tB^H
z4O$J4Z^$)dZ0fH2vITQ^`FO6)VEHpyuVXWgT79N3%&Y}m)IFG?Mqx1GBtO6_)jD!F
z+Kr5Tr2l8)pYc2+Px?kw2=x+1pudHj(U<wfTt;P%%tEb=86x!GM4zw*%u|QL8q`rx
z+~jiVkX+A$&vRuSb51!iznEM4@fAGOuQ&C<GZ*_<!E__OPu53GhRO`r7+9_%woD7{
zDpDBzFrp>1k;(GORg0dPit%Re%G?*q+^#{h88c>Zte!G1^AEX)nKPI~iKECF?V}f|
zb+M0pn2be0YL5>4pNlOr^g)>~sFL7=_^9b|GLDVa(Ke_=>WlC`(hK!M7DBh@!)q!J
zZO&mey_AfM?qC+gR30Nm^fGzcD%yA{d7O+*PieJV#^)$VYUVj<lSMCWau7VpFB5bh
zV=iW?Bhi;xT>}R3V5@^rbAoBI0BqvRT;+;I?Ajc>7|+eeTbuRg{)~n_P|sle%&Y*t
zKP;giV8{HCYACwFvMN0hBS2IeQEsC^^m0CYJtVp-J}h5R5o44_FJe(g-lKmoW^7&r
zw&;tE5qfR%o%Jcp_;{*oVy<<!2iL|h6Z%M3mRD=IPNllX;7RdJpY8sU`uz~MU+*&E
zdZP<no40s(jP3i8?rib9JHzg3@th5=Q2Na<2b6wuu@y?ceFl_%GockqzkLRje$i2(
z^t+!Vp!A#VtWf&xGobXF|Eo~??K7bC>mMqVe)pCHlzwx36-vK-29$oYUKL8eeFl^%
zEbe!wN<is1-&Jwxx6gpmZ?>pH>9@}crI!Y*Q2O1+5>Wch3sorn_8Cz6&6-pw{q`A9
zrigLByJ7-Lzxk4iOTT>vlzy`f6-vK-29zl*&b*1wy)FTz-~2(vrQbdSO23-zB1(|<
zzc(bH^qUc=Q2OmNpiIG~-#!D%6ww2hKKB;{lztWP%Hn?e3@H8T$rVb!eFl^%EY2LX
z&z%barC&9<;?i%Q0i|C}wnFK*&ww(8#r^gfP<mHj>^D}rYmdfw_xDd46-TZixYGT$
zm%2BfUqq?y`g^VlC!gM^1;5d=YVC5Wy5=kG>uvFG<;*Mnmd<yoW<J+l$Hq$c_rYK8
zxA?3+cGR+^t#99gYjT>$`mEad_^x{UsQ5uB`4ys<I<Jckr13W4*!5QT5x0NWy=8^G
zx#fNIr@9-An)5&P_q+pryiLGRZ*?Di`*+=2R_L2sR_OctFjo}uTSiuOf0zf`Z&VCX
zf8SOw(iIWgiV&MQ_@p+cinX_`o=Xe_-aY3A;@D0U#r%rExqdTXXM?!RC-dSeV9JLh
zB5YNTs%Z3`Yg+Ut%edQ`g<R%G>G0I^=wgr5%~yRpvv-;ptRJh6v5mj_HbdgGW97+R
zz?L6plW2T4?MeG#{4ExzL*lBdhI$-y^_BJQ%m>nNS3g!AW1HXAw;2+j9jiN5bHJ7#
zXT;t*oY8(5e~ZOx)0T_4{O0Z#`}ukdbj4}64z9Qx3S*nkZ4%$IIL!fDew@YQbhDfp
zwj4OC_u;F?Yka#jF&jT-`&c5r%`iBZ#cxg++k7$)eDQeB31coC*8BWbV|(b_SjV|6
zUN(;}?u)D7^Sg2`o!%M>V_Upzl0y&wOT}HlmLF&N#zbsfG_;?^`>F16Wqi9z$9Vc(
z{FwdpR!W>9M!LqD@$(vn%Yd;hj`P45kLR2)=E7lJ$9U>3&v>ch48GVEFGJ_ZCcd~Y
zu7c0+y7hE=YbcCu@v=z{J^U{fcL7^|oaGx6ef5^7E#v)Ef4wy%);1rEpI@bAQsN9T
z($#<DgfU+Z<MEsahlVj14(mF>Q*U|3OC9I3cp17cZsLpk;wt$3?ix#{w}!&l7B8FR
z(8K>yaTl=V$63BH(N}MI+A`ix_19ZNVr}!m`1w_OD<#elBYpMO5E%32Fdol&*x4}V
z!eLz}c<L=rU##O?7B55h#Z7#1Ut9&B-#y#u^wv-q+u~)D9D4X)D((Wd{5Z=uCi?0v
zPg}<Oss4IvNUUu>7(c&CZ>7W;Vx+I$8Uka!9LD204?7#iTsW-j1W&!?>5Fxo%i?9|
zzPO1m?u)D7^ZUh=bb4zjjBW9<Ne(^yFBNwITYjA78xwu?mZvS_{ZxOwH6+$HAB>-0
zrMFVz3^CGIZw-MlUk>B(oQItaV=f%lb%Lkf^7O?z&Smj3bYI-W7x%?g@bQakKEJA#
zPHzo`u`OOU$)Sh;rQ$AN%a5~sW1_F#^0Z~VpX#r-hQ!+DgYomL^j1ooAx8S@tsyYx
z%V9j8^RTmF%!R|cPVm%Qp1xSexh!6W?u(oF;=Z^FKAt0UqBqaj;;BYFF9uHSX<R&4
z#-2>KTeh&LnN9U;W;~akXI%1Yqo>;Pi+(Gk`*_{?yL+1|Ck}<NEnYT>&%^&xaTl=V
z$63BH(N}MI+A`ixb;oObyEHKyKW4xC6H{^;Vx+I$8UkZm9LISd#?~Qb^5)QTPA(kQ
zb%Lkf^7O?z&Smj3bYI-W*S~M^`wjVYdTS_*ZSk^-jZ@+C@W0g9^5ZPum<WAG4xGjN
z(*AnO)9;pHZR0b(O{Eo5;#?NLIbqC~!+1RB!J%Qyg~Pf|@YGwL@lwaREMA80i<|i3
zzPJiLzbCk)(_2GfY>Ssoa_HfIskjT+^5ZPunCPpwJZ%~8r~2!yA+fgkVEp_ly_FJY
zh>`xa8Ly{oZ8x6j6ENn>VLYDmu(M&zg~Pf|@YGwL@lwYbe6cHDhVF}-_~O2}3}64J
zI@O=WWKVheMbAaL(NoAS^?%hTko`ri&(*%Z$7gzK6zlETU}u`Y{9bKlcfZ`<{|siu
zXCb}NGtX{?;8pqTq)V;&wYdL8w)<xhe+pF{|I_k0I_G!z=bEiO)9mY1bFe3xwVi4H
ucBI!-Ygsxj=V!O{&7oe*<c^9xJ;#ap-I?Zjr&`)AzxlET15K9bZ~g~6G*kcp

literal 0
HcmV?d00001

diff --git a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
index 798ecce5c3c5dd..fb11f499f8c916 100644
--- a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
+++ b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln
@@ -1,77 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json.Tests", "tests\System.Runtime.Serialization.Json.Tests.csproj", "{173F6978-B961-4D1C-84E4-06468772D019}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{080B8264-CE67-4366-8829-C4586C46DF19}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json.ReflectionOnly.Tests", "tests\ReflectionOnly\System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj", "{C99A835E-46F3-4C05-AD34-7DD84FB7466B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1EC4598E-2F4C-481A-8648-E9A4F729CE2D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json", "src\System.Runtime.Serialization.Json.csproj", "{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5119E88F-FA73-4FC6-A327-DD7C77E746BC} = {5119E88F-FA73-4FC6-A327-DD7C77E746BC}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj", "{6045DECE-8425-4EE2-8685-7F2F21A3F691}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json", "ref\System.Runtime.Serialization.Json.csproj", "{5119E88F-FA73-4FC6-A327-DD7C77E746BC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json", "ref\System.Runtime.Serialization.Json.csproj", "{A0C8500C-06E8-4016-9A05-C6FC0D51BC01}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json", "src\System.Runtime.Serialization.Json.csproj", "{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{093A2EED-031E-47A2-91C6-5B21D6B587F5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json.ReflectionOnly.Tests", "tests\ReflectionOnly\System.Runtime.Serialization.Json.ReflectionOnly.Tests.csproj", "{AA73F333-D597-45F9-BC6E-75008C319C83}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj", "{7A5FC511-537D-4B4D-A138-34F3D81C68C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json.Tests", "tests\System.Runtime.Serialization.Json.Tests.csproj", "{3898FE7A-F5E1-48BD-AD67-F8680B944631}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{D41A4034-8A9A-44C5-B739-18BCB153D2D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2C6C23B6-9A8B-4D5D-B8FD-5B938F74926D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2D61B9AD-355B-49CC-8983-C004E4BC7DCB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{6EC6D07B-C92C-4BFD-8DAB-ADB0E020DF08}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{92BF2B65-87FB-44A0-9D9B-D2AB2A8715C2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{080B8264-CE67-4366-8829-C4586C46DF19} = {2D61B9AD-355B-49CC-8983-C004E4BC7DCB}
+		{AA73F333-D597-45F9-BC6E-75008C319C83} = {2D61B9AD-355B-49CC-8983-C004E4BC7DCB}
+		{3898FE7A-F5E1-48BD-AD67-F8680B944631} = {2D61B9AD-355B-49CC-8983-C004E4BC7DCB}
+		{1EC4598E-2F4C-481A-8648-E9A4F729CE2D} = {6EC6D07B-C92C-4BFD-8DAB-ADB0E020DF08}
+		{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D} = {6EC6D07B-C92C-4BFD-8DAB-ADB0E020DF08}
+		{A0C8500C-06E8-4016-9A05-C6FC0D51BC01} = {6EC6D07B-C92C-4BFD-8DAB-ADB0E020DF08}
+		{D41A4034-8A9A-44C5-B739-18BCB153D2D2} = {6EC6D07B-C92C-4BFD-8DAB-ADB0E020DF08}
+		{2C6C23B6-9A8B-4D5D-B8FD-5B938F74926D} = {6EC6D07B-C92C-4BFD-8DAB-ADB0E020DF08}
+		{6045DECE-8425-4EE2-8685-7F2F21A3F691} = {92BF2B65-87FB-44A0-9D9B-D2AB2A8715C2}
+		{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB} = {92BF2B65-87FB-44A0-9D9B-D2AB2A8715C2}
+		{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E} = {92BF2B65-87FB-44A0-9D9B-D2AB2A8715C2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{173F6978-B961-4D1C-84E4-06468772D019}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{173F6978-B961-4D1C-84E4-06468772D019}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C99A835E-46F3-4C05-AD34-7DD84FB7466B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5119E88F-FA73-4FC6-A327-DD7C77E746BC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{093A2EED-031E-47A2-91C6-5B21D6B587F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{093A2EED-031E-47A2-91C6-5B21D6B587F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{093A2EED-031E-47A2-91C6-5B21D6B587F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{093A2EED-031E-47A2-91C6-5B21D6B587F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A5FC511-537D-4B4D-A138-34F3D81C68C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A5FC511-537D-4B4D-A138-34F3D81C68C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A5FC511-537D-4B4D-A138-34F3D81C68C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A5FC511-537D-4B4D-A138-34F3D81C68C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{080B8264-CE67-4366-8829-C4586C46DF19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{080B8264-CE67-4366-8829-C4586C46DF19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{080B8264-CE67-4366-8829-C4586C46DF19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{080B8264-CE67-4366-8829-C4586C46DF19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EC4598E-2F4C-481A-8648-E9A4F729CE2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EC4598E-2F4C-481A-8648-E9A4F729CE2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EC4598E-2F4C-481A-8648-E9A4F729CE2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EC4598E-2F4C-481A-8648-E9A4F729CE2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6045DECE-8425-4EE2-8685-7F2F21A3F691}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD90904E-16A2-41A4-A7A1-1AFDEE7E829D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{099AEB79-0631-42B8-ACB8-1BC5C0C0D0EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0C8500C-06E8-4016-9A05-C6FC0D51BC01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{209F90AA-5CA1-4DFA-8641-05A0AA4FDC8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA73F333-D597-45F9-BC6E-75008C319C83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA73F333-D597-45F9-BC6E-75008C319C83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA73F333-D597-45F9-BC6E-75008C319C83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA73F333-D597-45F9-BC6E-75008C319C83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3898FE7A-F5E1-48BD-AD67-F8680B944631}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3898FE7A-F5E1-48BD-AD67-F8680B944631}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3898FE7A-F5E1-48BD-AD67-F8680B944631}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3898FE7A-F5E1-48BD-AD67-F8680B944631}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D41A4034-8A9A-44C5-B739-18BCB153D2D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D41A4034-8A9A-44C5-B739-18BCB153D2D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D41A4034-8A9A-44C5-B739-18BCB153D2D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D41A4034-8A9A-44C5-B739-18BCB153D2D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C6C23B6-9A8B-4D5D-B8FD-5B938F74926D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C6C23B6-9A8B-4D5D-B8FD-5B938F74926D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C6C23B6-9A8B-4D5D-B8FD-5B938F74926D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C6C23B6-9A8B-4D5D-B8FD-5B938F74926D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{173F6978-B961-4D1C-84E4-06468772D019} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C99A835E-46F3-4C05-AD34-7DD84FB7466B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{5119E88F-FA73-4FC6-A327-DD7C77E746BC} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{093A2EED-031E-47A2-91C6-5B21D6B587F5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{7A5FC511-537D-4B4D-A138-34F3D81C68C9} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6BB5B700-6575-4C04-ADF5-1680E2177DB2}
+		SolutionGuid = {5D066F36-FE2F-41D2-A586-BBA5192A8BCA}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln b/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
index f66a72c803e2a9..0cd21d6929c594 100644
--- a/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
+++ b/src/libraries/System.Runtime.Serialization.Primitives/System.Runtime.Serialization.Primitives.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives.Tests", "tests\System.Runtime.Serialization.Primitives.Tests.csproj", "{43341081-27A8-4CFB-8B89-C63CE457EAC2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01} = {CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5E9F435A-B4F6-4B3F-988B-80653A10F54D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives", "src\System.Runtime.Serialization.Primitives.csproj", "{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7E73C175-98C7-471B-B1A4-998C20F58854} = {7E73C175-98C7-471B-B1A4-998C20F58854}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9C3316F9-7846-4D3C-9565-F13C6CB32599}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives", "ref\System.Runtime.Serialization.Primitives.csproj", "{7E73C175-98C7-471B-B1A4-998C20F58854}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{74FB3690-555A-46DD-8A78-5DD6E0017B15}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives", "ref\System.Runtime.Serialization.Primitives.csproj", "{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives", "src\System.Runtime.Serialization.Primitives.csproj", "{70F6A111-C73E-4989-BCE4-ED790E1E2882}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{F290F6B1-FAB9-45B0-9295-BD786D887E55}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Primitives.Tests", "tests\System.Runtime.Serialization.Primitives.Tests.csproj", "{AB51C1E2-6308-4989-B037-5712B6503C77}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3E86D4D6-1F4F-4739-8DA7-CC78F39CA0C2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D81C7D9C-D754-4473-AC53-6F1E5D94BC87}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B1644C65-0176-40FD-AA1F-4E52A351C73B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BAEEFAD3-F08F-4AE3-9527-D05D72E75230}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{64E781F9-A013-413E-A83A-198993B64904}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5E9F435A-B4F6-4B3F-988B-80653A10F54D} = {B1644C65-0176-40FD-AA1F-4E52A351C73B}
+		{AB51C1E2-6308-4989-B037-5712B6503C77} = {B1644C65-0176-40FD-AA1F-4E52A351C73B}
+		{9C3316F9-7846-4D3C-9565-F13C6CB32599} = {BAEEFAD3-F08F-4AE3-9527-D05D72E75230}
+		{74FB3690-555A-46DD-8A78-5DD6E0017B15} = {BAEEFAD3-F08F-4AE3-9527-D05D72E75230}
+		{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D} = {BAEEFAD3-F08F-4AE3-9527-D05D72E75230}
+		{3E86D4D6-1F4F-4739-8DA7-CC78F39CA0C2} = {BAEEFAD3-F08F-4AE3-9527-D05D72E75230}
+		{D81C7D9C-D754-4473-AC53-6F1E5D94BC87} = {BAEEFAD3-F08F-4AE3-9527-D05D72E75230}
+		{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0} = {64E781F9-A013-413E-A83A-198993B64904}
+		{70F6A111-C73E-4989-BCE4-ED790E1E2882} = {64E781F9-A013-413E-A83A-198993B64904}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{43341081-27A8-4CFB-8B89-C63CE457EAC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{43341081-27A8-4CFB-8B89-C63CE457EAC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{43341081-27A8-4CFB-8B89-C63CE457EAC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{43341081-27A8-4CFB-8B89-C63CE457EAC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7E73C175-98C7-471B-B1A4-998C20F58854}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7E73C175-98C7-471B-B1A4-998C20F58854}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7E73C175-98C7-471B-B1A4-998C20F58854}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7E73C175-98C7-471B-B1A4-998C20F58854}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F290F6B1-FAB9-45B0-9295-BD786D887E55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F290F6B1-FAB9-45B0-9295-BD786D887E55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F290F6B1-FAB9-45B0-9295-BD786D887E55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F290F6B1-FAB9-45B0-9295-BD786D887E55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E9F435A-B4F6-4B3F-988B-80653A10F54D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C3316F9-7846-4D3C-9565-F13C6CB32599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C3316F9-7846-4D3C-9565-F13C6CB32599}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C3316F9-7846-4D3C-9565-F13C6CB32599}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C3316F9-7846-4D3C-9565-F13C6CB32599}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74FB3690-555A-46DD-8A78-5DD6E0017B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74FB3690-555A-46DD-8A78-5DD6E0017B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74FB3690-555A-46DD-8A78-5DD6E0017B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74FB3690-555A-46DD-8A78-5DD6E0017B15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1B28C08-A7D3-4FF1-9AF1-07486E871EC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F0F182E-71C9-4CB5-8E5E-94AFEE489B1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70F6A111-C73E-4989-BCE4-ED790E1E2882}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70F6A111-C73E-4989-BCE4-ED790E1E2882}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70F6A111-C73E-4989-BCE4-ED790E1E2882}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70F6A111-C73E-4989-BCE4-ED790E1E2882}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB51C1E2-6308-4989-B037-5712B6503C77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB51C1E2-6308-4989-B037-5712B6503C77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB51C1E2-6308-4989-B037-5712B6503C77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB51C1E2-6308-4989-B037-5712B6503C77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E86D4D6-1F4F-4739-8DA7-CC78F39CA0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E86D4D6-1F4F-4739-8DA7-CC78F39CA0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E86D4D6-1F4F-4739-8DA7-CC78F39CA0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E86D4D6-1F4F-4739-8DA7-CC78F39CA0C2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D81C7D9C-D754-4473-AC53-6F1E5D94BC87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D81C7D9C-D754-4473-AC53-6F1E5D94BC87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D81C7D9C-D754-4473-AC53-6F1E5D94BC87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D81C7D9C-D754-4473-AC53-6F1E5D94BC87}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{43341081-27A8-4CFB-8B89-C63CE457EAC2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{CDF0ACB5-1361-4E48-8ECB-22E8022F5F01} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{7E73C175-98C7-471B-B1A4-998C20F58854} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{F290F6B1-FAB9-45B0-9295-BD786D887E55} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C14B64DA-EF7A-43D0-8879-186AE8D765AB}
+		SolutionGuid = {7BC9AD65-7DA0-465C-B6FF-6037B3A864CD}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
index 9e8e140245bc51..22ff1b74e9ed1a 100644
--- a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
+++ b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln
@@ -1,80 +1,135 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.Tests", "tests\System.Runtime.Serialization.Xml.Tests.csproj", "{30CAB353-089E-4294-B23B-F2DD1D945654}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CBA80130-6773-4DF9-995C-DC6CBED89CB5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.Canonicalization", "tests\Canonicalization\System.Runtime.Serialization.Xml.Canonicalization.csproj", "{D3AD82FC-051D-4121-8E48-B13CE8024776}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3F1CD832-E457-43EA-938B-726661177172}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.ReflectionOnly.Tests", "tests\ReflectionOnly\System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj", "{38889701-0af4-48b3-999c-e99d639c61b6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\ref\System.CodeDom.csproj", "{7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml", "src\System.Runtime.Serialization.Xml.csproj", "{9D747A18-C8FD-4D7A-8913-4ED7911683B4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{025743B4-6E1E-4602-BE7F-1E479CC8EEBE} = {025743B4-6E1E-4602-BE7F-1E479CC8EEBE}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.CodeDom", "..\System.CodeDom\src\System.CodeDom.csproj", "{1392041A-E2CA-4553-BEAF-363974651B81}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml", "ref\System.Runtime.Serialization.Xml.csproj", "{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.DataContractSerialization", "..\System.Private.DataContractSerialization\src\System.Private.DataContractSerialization.csproj", "{76AC3DDD-2B38-489F-A8B0-8E43054595DB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A91D124D-A7BB-4C10-879E-792F7D9F656D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A06A6D01-E1D2-42A0-A28C-5EEFC1445012}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7EB25E8A-B971-4422-9CA1-DC3E1FB5331E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml", "ref\System.Runtime.Serialization.Xml.csproj", "{19F785D2-F7A4-41AB-9301-A6AD7E40B238}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml", "src\System.Runtime.Serialization.Xml.csproj", "{6FD10BE0-24C8-456E-8B9A-FD101C05C961}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.ReflectionOnly.Tests", "tests\ReflectionOnly\System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj", "{8B069551-9B95-464E-BB40-C56817506FEC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.Tests", "tests\System.Runtime.Serialization.Xml.Tests.csproj", "{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{23B3D4BF-F750-41CD-9CB7-4CB5D64019DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{1B698FC7-0121-4092-AEAB-5BC7D354B05C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{0F53467C-CE7E-482D-B649-8AB43F8E6BE6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{1B88B500-FDCB-455C-8307-E534B8EB0C84}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DB73E0AC-E80B-4662-954D-05662CBFB177}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D634E6C0-A090-49DC-9097-8917B86A9971}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{CBA80130-6773-4DF9-995C-DC6CBED89CB5} = {DB73E0AC-E80B-4662-954D-05662CBFB177}
+		{8B069551-9B95-464E-BB40-C56817506FEC} = {DB73E0AC-E80B-4662-954D-05662CBFB177}
+		{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C} = {DB73E0AC-E80B-4662-954D-05662CBFB177}
+		{3F1CD832-E457-43EA-938B-726661177172} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{A91D124D-A7BB-4C10-879E-792F7D9F656D} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{19F785D2-F7A4-41AB-9301-A6AD7E40B238} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{23B3D4BF-F750-41CD-9CB7-4CB5D64019DE} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{1B698FC7-0121-4092-AEAB-5BC7D354B05C} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{0F53467C-CE7E-482D-B649-8AB43F8E6BE6} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{1B88B500-FDCB-455C-8307-E534B8EB0C84} = {A83F7E17-CB78-4CA6-AA1C-D4041ECDB46D}
+		{1392041A-E2CA-4553-BEAF-363974651B81} = {D634E6C0-A090-49DC-9097-8917B86A9971}
+		{76AC3DDD-2B38-489F-A8B0-8E43054595DB} = {D634E6C0-A090-49DC-9097-8917B86A9971}
+		{A06A6D01-E1D2-42A0-A28C-5EEFC1445012} = {D634E6C0-A090-49DC-9097-8917B86A9971}
+		{6FD10BE0-24C8-456E-8B9A-FD101C05C961} = {D634E6C0-A090-49DC-9097-8917B86A9971}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30CAB353-089E-4294-B23B-F2DD1D945654}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30CAB353-089E-4294-B23B-F2DD1D945654}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3AD82FC-051D-4121-8E48-B13CE8024776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3AD82FC-051D-4121-8E48-B13CE8024776}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3AD82FC-051D-4121-8E48-B13CE8024776}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3AD82FC-051D-4121-8E48-B13CE8024776}.Release|Any CPU.Build.0 = Release|Any CPU
-		{38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{38889701-0af4-48b3-999c-e99d639c61b6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{38889701-0af4-48b3-999c-e99d639c61b6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{025743B4-6E1E-4602-BE7F-1E479CC8EEBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7EB25E8A-B971-4422-9CA1-DC3E1FB5331E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7EB25E8A-B971-4422-9CA1-DC3E1FB5331E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7EB25E8A-B971-4422-9CA1-DC3E1FB5331E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7EB25E8A-B971-4422-9CA1-DC3E1FB5331E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBA80130-6773-4DF9-995C-DC6CBED89CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBA80130-6773-4DF9-995C-DC6CBED89CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBA80130-6773-4DF9-995C-DC6CBED89CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBA80130-6773-4DF9-995C-DC6CBED89CB5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F1CD832-E457-43EA-938B-726661177172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F1CD832-E457-43EA-938B-726661177172}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F1CD832-E457-43EA-938B-726661177172}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F1CD832-E457-43EA-938B-726661177172}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DF41C40-FE5D-41DF-B106-3DD77BE4D4B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1392041A-E2CA-4553-BEAF-363974651B81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1392041A-E2CA-4553-BEAF-363974651B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1392041A-E2CA-4553-BEAF-363974651B81}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1392041A-E2CA-4553-BEAF-363974651B81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D33B2CF1-2654-40DA-8EA6-DA5A2A453BAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76AC3DDD-2B38-489F-A8B0-8E43054595DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A91D124D-A7BB-4C10-879E-792F7D9F656D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A91D124D-A7BB-4C10-879E-792F7D9F656D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A91D124D-A7BB-4C10-879E-792F7D9F656D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A91D124D-A7BB-4C10-879E-792F7D9F656D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A06A6D01-E1D2-42A0-A28C-5EEFC1445012}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19F785D2-F7A4-41AB-9301-A6AD7E40B238}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FD10BE0-24C8-456E-8B9A-FD101C05C961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FD10BE0-24C8-456E-8B9A-FD101C05C961}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FD10BE0-24C8-456E-8B9A-FD101C05C961}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FD10BE0-24C8-456E-8B9A-FD101C05C961}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B069551-9B95-464E-BB40-C56817506FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B069551-9B95-464E-BB40-C56817506FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B069551-9B95-464E-BB40-C56817506FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B069551-9B95-464E-BB40-C56817506FEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FF5E841-29F6-4DB7-A4F8-9281FBDA0B9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23B3D4BF-F750-41CD-9CB7-4CB5D64019DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23B3D4BF-F750-41CD-9CB7-4CB5D64019DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23B3D4BF-F750-41CD-9CB7-4CB5D64019DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23B3D4BF-F750-41CD-9CB7-4CB5D64019DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B698FC7-0121-4092-AEAB-5BC7D354B05C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B698FC7-0121-4092-AEAB-5BC7D354B05C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B698FC7-0121-4092-AEAB-5BC7D354B05C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B698FC7-0121-4092-AEAB-5BC7D354B05C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F53467C-CE7E-482D-B649-8AB43F8E6BE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F53467C-CE7E-482D-B649-8AB43F8E6BE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F53467C-CE7E-482D-B649-8AB43F8E6BE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F53467C-CE7E-482D-B649-8AB43F8E6BE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B88B500-FDCB-455C-8307-E534B8EB0C84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B88B500-FDCB-455C-8307-E534B8EB0C84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B88B500-FDCB-455C-8307-E534B8EB0C84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B88B500-FDCB-455C-8307-E534B8EB0C84}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{30CAB353-089E-4294-B23B-F2DD1D945654} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D3AD82FC-051D-4121-8E48-B13CE8024776} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{38889701-0af4-48b3-999c-e99d639c61b6} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{025743B4-6E1E-4602-BE7F-1E479CC8EEBE} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7EB25E8A-B971-4422-9CA1-DC3E1FB5331E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E4F1AE1F-1634-4F13-B1A6-A6C5CAAA5A89}
+		SolutionGuid = {EE9FB522-4B73-4E3E-B63D-C21826BB7B5D}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln
index d5992a5981a20e..1bc5f254a8224a 100644
--- a/src/libraries/System.Runtime/System.Runtime.sln
+++ b/src/libraries/System.Runtime/System.Runtime.sln
@@ -1,117 +1,483 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Tests", "tests\System.Runtime.Tests.csproj", "{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Nls.Tests", "tests\NlsTests\System.Runtime.Nls.Tests.csproj", "{F6ED1D9D-DBF6-420A-9710-672BF78A00E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCollectibleAssembly", "tests\TestCollectibleAssembly\TestCollectibleAssembly.csproj", "{F9C30DC5-30C1-45DA-9336-F7BE358C367C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FB17AC52-1633-4845-932B-9218DF895957}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLoadAssembly", "tests\TestLoadAssembly\TestLoadAssembly.csproj", "{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D98FBB47-1DFD-4021-9C80-3034D699EAD6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestModule", "tests\TestModule\System.Reflection.TestModule.ilproj", "{3B7489C4-65DB-4E69-BE01-F6234133400C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{9C41B325-1225-43CA-9436-549AFF6D90A1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.TestStructs", "tests\TestStructs\System.TestStructs.ilproj", "{6B002B34-089C-4BC4-91DD-57D350DEA91C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Uri", "..\System.Private.Uri\src\System.Private.Uri.csproj", "{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "src\System.Runtime.csproj", "{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6} = {ADBCF120-3454-4A3C-9D1D-AC4293E795D6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "ref\System.Runtime.csproj", "{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{26541647-B653-4480-9448-BA275D53C81D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "ref\System.Runtime.csproj", "{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime", "src\System.Runtime.csproj", "{A83A8520-F5E2-49B4-83BC-0F82A412951D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Nls.Tests", "tests\NlsTests\System.Runtime.Nls.Tests.csproj", "{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Tests", "tests\System.Runtime.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities.Unicode", "..\Common\tests\TestUtilities.Unicode\TestUtilities.Unicode.csproj", "{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCollectibleAssembly", "tests\TestCollectibleAssembly\TestCollectibleAssembly.csproj", "{C230AC88-A377-4BEB-824F-AB174C14DC86}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLoadAssembly", "tests\TestLoadAssembly\TestLoadAssembly.csproj", "{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reflection.TestModule", "tests\TestModule\System.Reflection.TestModule.ilproj", "{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.TestStructs", "tests\TestStructs\System.TestStructs.ilproj", "{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{67E57433-4571-442C-9EB7-5512847FFE51}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{F6A8185B-07C6-401D-9B40-3C560239E05F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F5D24DC1-048D-4306-9C48-5963685F825C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{82A02402-0C05-4A8C-98DD-058844E8D224}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{82728202-1098-4E16-B598-5762EAF67D08}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BDCC9986-D51F-48D9-9650-388E172CD91E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F10B6C-21C0-4C9D-8909-76FC52145120}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{26541647-B653-4480-9448-BA275D53C81D} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{F6A8185B-07C6-401D-9B40-3C560239E05F} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{82A02402-0C05-4A8C-98DD-058844E8D224} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{FB17AC52-1633-4845-932B-9218DF895957} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{C230AC88-A377-4BEB-824F-AB174C14DC86} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD} = {BDCC9986-D51F-48D9-9650-388E172CD91E}
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{9C41B325-1225-43CA-9436-549AFF6D90A1} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{67E57433-4571-442C-9EB7-5512847FFE51} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{F5D24DC1-048D-4306-9C48-5963685F825C} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+		{82728202-1098-4E16-B598-5762EAF67D08} = {F4F10B6C-21C0-4C9D-8909-76FC52145120}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F6ED1D9D-DBF6-420A-9710-672BF78A00E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9C30DC5-30C1-45DA-9336-F7BE358C367C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71DE1A1F-F8E2-452A-9D54-0385F6099DD3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B7489C4-65DB-4E69-BE01-F6234133400C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B7489C4-65DB-4E69-BE01-F6234133400C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B7489C4-65DB-4E69-BE01-F6234133400C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B7489C4-65DB-4E69-BE01-F6234133400C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6B002B34-089C-4BC4-91DD-57D350DEA91C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B002B34-089C-4BC4-91DD-57D350DEA91C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6B002B34-089C-4BC4-91DD-57D350DEA91C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B002B34-089C-4BC4-91DD-57D350DEA91C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|Any CPU.Build.0 = Debug|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x64.ActiveCfg = Debug|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x64.Build.0 = Debug|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x86.ActiveCfg = Debug|x86
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x86.Build.0 = Debug|x86
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|Any CPU.ActiveCfg = Release|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|Any CPU.Build.0 = Release|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x64.ActiveCfg = Release|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x64.Build.0 = Release|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x86.ActiveCfg = Release|x86
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x86.Build.0 = Release|x86
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|Any CPU.Build.0 = Checked|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.ActiveCfg = Checked|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.Build.0 = Checked|x64
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.ActiveCfg = Checked|x86
+		{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.Build.0 = Checked|x86
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Debug|x64.Build.0 = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Debug|x86.Build.0 = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Release|x64.ActiveCfg = Release|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Release|x64.Build.0 = Release|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Release|x86.ActiveCfg = Release|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Release|x86.Build.0 = Release|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9DF0247E-5B81-4EF3-82CA-3E70B3A56742}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Debug|x64.Build.0 = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Debug|x86.Build.0 = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Release|x64.ActiveCfg = Release|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Release|x64.Build.0 = Release|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Release|x86.Build.0 = Release|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FB17AC52-1633-4845-932B-9218DF895957}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Debug|x64.Build.0 = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Debug|x86.Build.0 = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Release|x64.ActiveCfg = Release|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Release|x64.Build.0 = Release|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Release|x86.ActiveCfg = Release|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Release|x86.Build.0 = Release|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D98FBB47-1DFD-4021-9C80-3034D699EAD6}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Debug|x86.Build.0 = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Release|x64.Build.0 = Release|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Release|x86.Build.0 = Release|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9C41B325-1225-43CA-9436-549AFF6D90A1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Debug|x64.Build.0 = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Debug|x86.Build.0 = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Release|x64.ActiveCfg = Release|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Release|x64.Build.0 = Release|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Release|x86.ActiveCfg = Release|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Release|x86.Build.0 = Release|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E7A05515-DABE-4C09-83CB-CE84EFDCD4CC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Debug|x86.Build.0 = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x64.Build.0 = Release|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x86.ActiveCfg = Release|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Release|x86.Build.0 = Release|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C1B93F37-FDD5-4ABB-A244-C6C60BD11CF3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Debug|x64.Build.0 = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Debug|x86.Build.0 = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Release|x64.ActiveCfg = Release|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Release|x64.Build.0 = Release|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Release|x86.ActiveCfg = Release|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Release|x86.Build.0 = Release|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{26541647-B653-4480-9448-BA275D53C81D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x64.Build.0 = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x86.Build.0 = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x64.ActiveCfg = Release|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x64.Build.0 = Release|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x86.ActiveCfg = Release|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x86.Build.0 = Release|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x64.Build.0 = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x86.Build.0 = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x64.ActiveCfg = Release|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x64.Build.0 = Release|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x86.Build.0 = Release|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Debug|x64.Build.0 = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Debug|x86.Build.0 = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Release|x64.ActiveCfg = Release|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Release|x64.Build.0 = Release|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Release|x86.ActiveCfg = Release|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Release|x86.Build.0 = Release|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3B79DD71-8C2F-41BC-A1A7-86A490D6C726}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.Build.0 = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x86.Build.0 = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x64.ActiveCfg = Release|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x64.Build.0 = Release|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x86.ActiveCfg = Release|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x86.Build.0 = Release|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Debug|x64.Build.0 = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Debug|x86.Build.0 = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Release|x64.ActiveCfg = Release|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Release|x64.Build.0 = Release|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Release|x86.ActiveCfg = Release|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Release|x86.Build.0 = Release|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{C230AC88-A377-4BEB-824F-AB174C14DC86}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Debug|x86.Build.0 = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Release|x64.Build.0 = Release|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Release|x86.Build.0 = Release|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1BCCD2F5-A561-4641-8A0B-51F3EDCA35DC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Debug|x64.Build.0 = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Debug|x86.Build.0 = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Release|x64.ActiveCfg = Release|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Release|x64.Build.0 = Release|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Release|x86.ActiveCfg = Release|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Release|x86.Build.0 = Release|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0F83B07B-2E3F-4708-BE6D-7A8DA8168803}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Release|x64.Build.0 = Release|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Release|x86.Build.0 = Release|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{833C1D45-9BBB-4A92-93B7-4EFFD9E945AD}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Debug|x64.Build.0 = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Debug|x86.Build.0 = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Release|x64.ActiveCfg = Release|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Release|x64.Build.0 = Release|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Release|x86.ActiveCfg = Release|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Release|x86.Build.0 = Release|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{67E57433-4571-442C-9EB7-5512847FFE51}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Debug|x64.Build.0 = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Debug|x86.Build.0 = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Release|x64.ActiveCfg = Release|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Release|x64.Build.0 = Release|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Release|x86.ActiveCfg = Release|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Release|x86.Build.0 = Release|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DBFDC8D7-97CA-444C-BE48-BAA09331CD1B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|x64.Build.0 = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Debug|x86.Build.0 = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Release|x64.ActiveCfg = Release|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Release|x64.Build.0 = Release|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Release|x86.ActiveCfg = Release|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Release|x86.Build.0 = Release|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{1B4552A4-91FD-4C6F-9EB4-3454C4BE428F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Release|x64.Build.0 = Release|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Release|x86.Build.0 = Release|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F6A8185B-07C6-401D-9B40-3C560239E05F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Debug|x64.Build.0 = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Release|x64.ActiveCfg = Release|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Release|x64.Build.0 = Release|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Release|x86.Build.0 = Release|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F5D24DC1-048D-4306-9C48-5963685F825C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Debug|x64.Build.0 = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Debug|x86.Build.0 = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Release|x64.ActiveCfg = Release|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Release|x64.Build.0 = Release|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Release|x86.ActiveCfg = Release|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Release|x86.Build.0 = Release|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82A02402-0C05-4A8C-98DD-058844E8D224}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Debug|x64.Build.0 = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Debug|x86.Build.0 = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Release|x64.ActiveCfg = Release|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Release|x64.Build.0 = Release|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Release|x86.ActiveCfg = Release|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Release|x86.Build.0 = Release|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{9CF6C6E6-0E9F-4A95-84B5-6083EAB6FA13}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|x64.Build.0 = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Debug|x86.Build.0 = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Release|x64.ActiveCfg = Release|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Release|x64.Build.0 = Release|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Release|x86.ActiveCfg = Release|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Release|x86.Build.0 = Release|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82728202-1098-4E16-B598-5762EAF67D08}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Debug|x64.Build.0 = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Debug|x86.Build.0 = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Release|x64.ActiveCfg = Release|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Release|x64.Build.0 = Release|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Release|x86.ActiveCfg = Release|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Release|x86.Build.0 = Release|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{069C2B51-069A-4FBB-BFE9-42D573F1CEEA}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B1BF7CE0-CAB5-4FA2-A39C-450B05D5DB1C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F6ED1D9D-DBF6-420A-9710-672BF78A00E4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F9C30DC5-30C1-45DA-9336-F7BE358C367C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{71DE1A1F-F8E2-452A-9D54-0385F6099DD3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3B7489C4-65DB-4E69-BE01-F6234133400C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6B002B34-089C-4BC4-91DD-57D350DEA91C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{ADBCF120-3454-4A3C-9D1D-AC4293E795D6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9EE64AF5-E04D-4E0E-8D87-F263E3CAF247} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D7833CAD-D4DB-4E60-8F77-A8EFF4B2D86B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FBD1A5A2-A6F0-444D-9D7D-86D77604F1F5}
+		SolutionGuid = {19706846-1F47-42ED-B649-B0982EE96E6B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
index 89cf5628a59877..7bbb6e6ce0a1c3 100644
--- a/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
+++ b/src/libraries/System.Security.AccessControl/System.Security.AccessControl.sln
@@ -1,60 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl.Tests", "tests\System.Security.AccessControl.Tests.csproj", "{70FAC855-CAC6-4523-8477-880548D58A1B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D27FFA1F-B446-4D24-B60A-1F88385CDB6D} = {D27FFA1F-B446-4D24-B60A-1F88385CDB6D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FE3865D4-48C5-4F67-A5EB-C041A1895100}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "src\System.Security.AccessControl.csproj", "{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F80C478C-48EE-46A5-89C4-EE0CFB23A14F} = {F80C478C-48EE-46A5-89C4-EE0CFB23A14F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{700350E8-B09E-4CC9-B718-0F727D11EDE2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "ref\System.Security.AccessControl.csproj", "{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{AF88522D-FC01-4DCF-9C26-24672857E978}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{BF6925D4-3E90-4530-995F-7879D5F303EB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{29593DA3-C071-4001-82C1-B473203AD08C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7BC2D7E9-03C7-4577-A895-6EB91B6A7EA3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "ref\System.Security.AccessControl.csproj", "{28201266-9EA3-4B92-83C5-ADEC5608E27A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "src\System.Security.AccessControl.csproj", "{E1E671BC-A82F-400A-9C93-ACB199A43BDA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl.Tests", "tests\System.Security.AccessControl.Tests.csproj", "{0B9499DE-C86E-4F3F-8F92-73DCC244A13B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{91215EF1-A93A-4C77-81CA-4AFDBC41182C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{CE278690-2333-49FC-8760-0BD967125E41}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A6560EDE-E3FA-4D30-ACB1-5F2A4F961584}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A52AA406-A3E3-4B7A-9252-9C61E066A6A7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C357AA01-3BA4-46A7-BCBD-77513E81D3AA}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{FE3865D4-48C5-4F67-A5EB-C041A1895100} = {A6560EDE-E3FA-4D30-ACB1-5F2A4F961584}
+		{0B9499DE-C86E-4F3F-8F92-73DCC244A13B} = {A6560EDE-E3FA-4D30-ACB1-5F2A4F961584}
+		{700350E8-B09E-4CC9-B718-0F727D11EDE2} = {A52AA406-A3E3-4B7A-9252-9C61E066A6A7}
+		{AF88522D-FC01-4DCF-9C26-24672857E978} = {A52AA406-A3E3-4B7A-9252-9C61E066A6A7}
+		{BF6925D4-3E90-4530-995F-7879D5F303EB} = {A52AA406-A3E3-4B7A-9252-9C61E066A6A7}
+		{28201266-9EA3-4B92-83C5-ADEC5608E27A} = {A52AA406-A3E3-4B7A-9252-9C61E066A6A7}
+		{91215EF1-A93A-4C77-81CA-4AFDBC41182C} = {A52AA406-A3E3-4B7A-9252-9C61E066A6A7}
+		{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340} = {C357AA01-3BA4-46A7-BCBD-77513E81D3AA}
+		{29593DA3-C071-4001-82C1-B473203AD08C} = {C357AA01-3BA4-46A7-BCBD-77513E81D3AA}
+		{E1E671BC-A82F-400A-9C93-ACB199A43BDA} = {C357AA01-3BA4-46A7-BCBD-77513E81D3AA}
+		{CE278690-2333-49FC-8760-0BD967125E41} = {C357AA01-3BA4-46A7-BCBD-77513E81D3AA}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{70FAC855-CAC6-4523-8477-880548D58A1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{70FAC855-CAC6-4523-8477-880548D58A1B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D27FFA1F-B446-4D24-B60A-1F88385CDB6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F80C478C-48EE-46A5-89C4-EE0CFB23A14F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7BC2D7E9-03C7-4577-A895-6EB91B6A7EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7BC2D7E9-03C7-4577-A895-6EB91B6A7EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7BC2D7E9-03C7-4577-A895-6EB91B6A7EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7BC2D7E9-03C7-4577-A895-6EB91B6A7EA3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE3865D4-48C5-4F67-A5EB-C041A1895100}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE3865D4-48C5-4F67-A5EB-C041A1895100}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE3865D4-48C5-4F67-A5EB-C041A1895100}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE3865D4-48C5-4F67-A5EB-C041A1895100}.Release|Any CPU.Build.0 = Release|Any CPU
+		{700350E8-B09E-4CC9-B718-0F727D11EDE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{700350E8-B09E-4CC9-B718-0F727D11EDE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{700350E8-B09E-4CC9-B718-0F727D11EDE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{700350E8-B09E-4CC9-B718-0F727D11EDE2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF88522D-FC01-4DCF-9C26-24672857E978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF88522D-FC01-4DCF-9C26-24672857E978}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF88522D-FC01-4DCF-9C26-24672857E978}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF88522D-FC01-4DCF-9C26-24672857E978}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28ACBF6E-C0FF-46BE-B9C0-0FA1AE05C340}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF6925D4-3E90-4530-995F-7879D5F303EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF6925D4-3E90-4530-995F-7879D5F303EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF6925D4-3E90-4530-995F-7879D5F303EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF6925D4-3E90-4530-995F-7879D5F303EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29593DA3-C071-4001-82C1-B473203AD08C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29593DA3-C071-4001-82C1-B473203AD08C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29593DA3-C071-4001-82C1-B473203AD08C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29593DA3-C071-4001-82C1-B473203AD08C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28201266-9EA3-4B92-83C5-ADEC5608E27A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28201266-9EA3-4B92-83C5-ADEC5608E27A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28201266-9EA3-4B92-83C5-ADEC5608E27A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28201266-9EA3-4B92-83C5-ADEC5608E27A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1E671BC-A82F-400A-9C93-ACB199A43BDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1E671BC-A82F-400A-9C93-ACB199A43BDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1E671BC-A82F-400A-9C93-ACB199A43BDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1E671BC-A82F-400A-9C93-ACB199A43BDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B9499DE-C86E-4F3F-8F92-73DCC244A13B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91215EF1-A93A-4C77-81CA-4AFDBC41182C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91215EF1-A93A-4C77-81CA-4AFDBC41182C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91215EF1-A93A-4C77-81CA-4AFDBC41182C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91215EF1-A93A-4C77-81CA-4AFDBC41182C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE278690-2333-49FC-8760-0BD967125E41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE278690-2333-49FC-8760-0BD967125E41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE278690-2333-49FC-8760-0BD967125E41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE278690-2333-49FC-8760-0BD967125E41}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{70FAC855-CAC6-4523-8477-880548D58A1B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{D27FFA1F-B446-4D24-B60A-1F88385CDB6D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F80C478C-48EE-46A5-89C4-EE0CFB23A14F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7BC2D7E9-03C7-4577-A895-6EB91B6A7EA3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FB302CDD-C173-44F3-B0F3-C9C36248368E}
+		SolutionGuid = {7F4F25A0-74DA-46ED-BC2B-99607E973B0D}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Claims/System.Security.Claims.sln b/src/libraries/System.Security.Claims/System.Security.Claims.sln
index fedc4e90d1043e..c45d68be81c0a5 100644
--- a/src/libraries/System.Security.Claims/System.Security.Claims.sln
+++ b/src/libraries/System.Security.Claims/System.Security.Claims.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims.Tests", "tests\System.Security.Claims.Tests.csproj", "{BE8B728D-86C1-406F-8F5F-6656EC486B01}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52} = {A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{74402B68-53BF-4B2F-BDEA-91F665E130D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "src\System.Security.Claims.csproj", "{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4372807C-BD21-476F-BCE2-3D192AC0B96C} = {4372807C-BD21-476F-BCE2-3D192AC0B96C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{44A1B07B-B7F9-4686-AA94-7CBAE7C42C01}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "ref\System.Security.Claims.csproj", "{4372807C-BD21-476F-BCE2-3D192AC0B96C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F46E0AB4-C56D-4E59-838C-B36E79F47B2D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E594FAC1-435A-4E29-9BF3-334DC2E3628D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{30144836-40EF-4DF9-844E-B22C1003CD29}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "ref\System.Security.Claims.csproj", "{DBBE28DA-7239-4C32-8308-2A65C10410DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4DEC508A-B53D-4F0F-8017-BE78E88FEF14}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims", "src\System.Security.Claims.csproj", "{85FAD30C-2D0C-406D-9F3B-DB7236016CC5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Claims.Tests", "tests\System.Security.Claims.Tests.csproj", "{12F9C4AA-F238-42A1-9324-2C3CB643595B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{5CFA6B5C-6C73-4ED8-BCF3-F9E26E13ACE8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F2F12708-F538-4B75-A12C-513288670FD7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E83130DD-BE8E-4CE3-ABAD-6837CE1FAB1D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9B53DE74-48BA-4C89-8169-68F564321B79}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{74402B68-53BF-4B2F-BDEA-91F665E130D2} = {F2F12708-F538-4B75-A12C-513288670FD7}
+		{12F9C4AA-F238-42A1-9324-2C3CB643595B} = {F2F12708-F538-4B75-A12C-513288670FD7}
+		{44A1B07B-B7F9-4686-AA94-7CBAE7C42C01} = {E83130DD-BE8E-4CE3-ABAD-6837CE1FAB1D}
+		{F46E0AB4-C56D-4E59-838C-B36E79F47B2D} = {E83130DD-BE8E-4CE3-ABAD-6837CE1FAB1D}
+		{30144836-40EF-4DF9-844E-B22C1003CD29} = {E83130DD-BE8E-4CE3-ABAD-6837CE1FAB1D}
+		{DBBE28DA-7239-4C32-8308-2A65C10410DE} = {E83130DD-BE8E-4CE3-ABAD-6837CE1FAB1D}
+		{5CFA6B5C-6C73-4ED8-BCF3-F9E26E13ACE8} = {E83130DD-BE8E-4CE3-ABAD-6837CE1FAB1D}
+		{E594FAC1-435A-4E29-9BF3-334DC2E3628D} = {9B53DE74-48BA-4C89-8169-68F564321B79}
+		{85FAD30C-2D0C-406D-9F3B-DB7236016CC5} = {9B53DE74-48BA-4C89-8169-68F564321B79}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BE8B728D-86C1-406F-8F5F-6656EC486B01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE8B728D-86C1-406F-8F5F-6656EC486B01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE8B728D-86C1-406F-8F5F-6656EC486B01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE8B728D-86C1-406F-8F5F-6656EC486B01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4372807C-BD21-476F-BCE2-3D192AC0B96C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4372807C-BD21-476F-BCE2-3D192AC0B96C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4372807C-BD21-476F-BCE2-3D192AC0B96C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4372807C-BD21-476F-BCE2-3D192AC0B96C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4DEC508A-B53D-4F0F-8017-BE78E88FEF14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4DEC508A-B53D-4F0F-8017-BE78E88FEF14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4DEC508A-B53D-4F0F-8017-BE78E88FEF14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4DEC508A-B53D-4F0F-8017-BE78E88FEF14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74402B68-53BF-4B2F-BDEA-91F665E130D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44A1B07B-B7F9-4686-AA94-7CBAE7C42C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44A1B07B-B7F9-4686-AA94-7CBAE7C42C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44A1B07B-B7F9-4686-AA94-7CBAE7C42C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44A1B07B-B7F9-4686-AA94-7CBAE7C42C01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F46E0AB4-C56D-4E59-838C-B36E79F47B2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E594FAC1-435A-4E29-9BF3-334DC2E3628D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30144836-40EF-4DF9-844E-B22C1003CD29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30144836-40EF-4DF9-844E-B22C1003CD29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30144836-40EF-4DF9-844E-B22C1003CD29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30144836-40EF-4DF9-844E-B22C1003CD29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBBE28DA-7239-4C32-8308-2A65C10410DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBBE28DA-7239-4C32-8308-2A65C10410DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBBE28DA-7239-4C32-8308-2A65C10410DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBBE28DA-7239-4C32-8308-2A65C10410DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85FAD30C-2D0C-406D-9F3B-DB7236016CC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85FAD30C-2D0C-406D-9F3B-DB7236016CC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85FAD30C-2D0C-406D-9F3B-DB7236016CC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85FAD30C-2D0C-406D-9F3B-DB7236016CC5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12F9C4AA-F238-42A1-9324-2C3CB643595B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12F9C4AA-F238-42A1-9324-2C3CB643595B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12F9C4AA-F238-42A1-9324-2C3CB643595B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12F9C4AA-F238-42A1-9324-2C3CB643595B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CFA6B5C-6C73-4ED8-BCF3-F9E26E13ACE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CFA6B5C-6C73-4ED8-BCF3-F9E26E13ACE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CFA6B5C-6C73-4ED8-BCF3-F9E26E13ACE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CFA6B5C-6C73-4ED8-BCF3-F9E26E13ACE8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{BE8B728D-86C1-406F-8F5F-6656EC486B01} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A70BEC0D-5A1C-4DA0-8A0F-69F3BF565D52} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{4372807C-BD21-476F-BCE2-3D192AC0B96C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{4DEC508A-B53D-4F0F-8017-BE78E88FEF14} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2951ABBC-F548-4A88-A600-8469ABF1E135}
+		SolutionGuid = {5C5ECBED-DFC4-4727-8DA2-68375AAB996B}
 	EndGlobalSection
 EndGlobal
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 c633dbf0affe28..ffa1a551c7dcf8 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,60 +1,121 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms.Tests", "tests\System.Security.Cryptography.Algorithms.Tests.csproj", "{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9} = {81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}
-	EndProjectSection
+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.Security.Cryptography.Algorithms", "src\System.Security.Cryptography.Algorithms.csproj", "{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F} = {102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7D8A3A8D-1D0B-48E3-AB03-F32EF60B2D9A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms", "ref\System.Security.Cryptography.Algorithms.csproj", "{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{AA21E963-CF6B-4474-81A6-D13279854954}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{11EF92B5-6C9B-4272-8360-F34A1109F831}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{520D79FA-3E30-48D7-84E9-67A8BF69ABA8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3F87192A-32C0-4D92-A28C-D104FB86CBFB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms", "ref\System.Security.Cryptography.Algorithms.csproj", "{64C0BC45-368B-44E6-9E04-2F7787CDF153}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms", "src\System.Security.Cryptography.Algorithms.csproj", "{4146BAB4-BA7C-405E-BEBC-9BE9826514BA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Algorithms.Tests", "tests\System.Security.Cryptography.Algorithms.Tests.csproj", "{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\ref\System.Security.Cryptography.Cng.csproj", "{DBCB0DE3-3BD7-4FE0-87E8-21FAD692B2AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{3928EE57-D7D0-45B8-AACD-57DF67D7089A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{5BD4A2ED-6203-41E2-9892-002BCC40B0C8}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{9CC71D46-5FAA-4CF2-BC86-A8BC89BFC4F6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0DB71748-BC54-496E-80C3-77BFA27E0C26}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{B5E268A4-3A93-4135-A0E9-CB216FC7A503}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{16443C56-0A5D-4D36-9ACF-4A26D9BF5C8E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0} = {0DB71748-BC54-496E-80C3-77BFA27E0C26}
+		{DD7260B7-A224-46EB-8CE6-94A4B22CB7CD} = {0DB71748-BC54-496E-80C3-77BFA27E0C26}
+		{7D8A3A8D-1D0B-48E3-AB03-F32EF60B2D9A} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{520D79FA-3E30-48D7-84E9-67A8BF69ABA8} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{64C0BC45-368B-44E6-9E04-2F7787CDF153} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{DBCB0DE3-3BD7-4FE0-87E8-21FAD692B2AE} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{5BD4A2ED-6203-41E2-9892-002BCC40B0C8} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{9CC71D46-5FAA-4CF2-BC86-A8BC89BFC4F6} = {B5E268A4-3A93-4135-A0E9-CB216FC7A503}
+		{AA21E963-CF6B-4474-81A6-D13279854954} = {16443C56-0A5D-4D36-9ACF-4A26D9BF5C8E}
+		{11EF92B5-6C9B-4272-8360-F34A1109F831} = {16443C56-0A5D-4D36-9ACF-4A26D9BF5C8E}
+		{4146BAB4-BA7C-405E-BEBC-9BE9826514BA} = {16443C56-0A5D-4D36-9ACF-4A26D9BF5C8E}
+		{3928EE57-D7D0-45B8-AACD-57DF67D7089A} = {16443C56-0A5D-4D36-9ACF-4A26D9BF5C8E}
+		{E5E427F0-D149-4992-AF31-F8616600E188} = {16443C56-0A5D-4D36-9ACF-4A26D9BF5C8E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{508A7D81-6462-459C-9F8F-B58FCCCFC8E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F87192A-32C0-4D92-A28C-D104FB86CBFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F87192A-32C0-4D92-A28C-D104FB86CBFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F87192A-32C0-4D92-A28C-D104FB86CBFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F87192A-32C0-4D92-A28C-D104FB86CBFB}.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
+		{E59CB8E0-D601-44F4-8A5E-6DC09F1A14C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D8A3A8D-1D0B-48E3-AB03-F32EF60B2D9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D8A3A8D-1D0B-48E3-AB03-F32EF60B2D9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D8A3A8D-1D0B-48E3-AB03-F32EF60B2D9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D8A3A8D-1D0B-48E3-AB03-F32EF60B2D9A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA21E963-CF6B-4474-81A6-D13279854954}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{4BC0C63E-CF17-4D38-8910-FE9FC4FB6E40}.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
+		{520D79FA-3E30-48D7-84E9-67A8BF69ABA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{520D79FA-3E30-48D7-84E9-67A8BF69ABA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{520D79FA-3E30-48D7-84E9-67A8BF69ABA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{520D79FA-3E30-48D7-84E9-67A8BF69ABA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64C0BC45-368B-44E6-9E04-2F7787CDF153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{DBCB0DE3-3BD7-4FE0-87E8-21FAD692B2AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBCB0DE3-3BD7-4FE0-87E8-21FAD692B2AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBCB0DE3-3BD7-4FE0-87E8-21FAD692B2AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBCB0DE3-3BD7-4FE0-87E8-21FAD692B2AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3928EE57-D7D0-45B8-AACD-57DF67D7089A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3928EE57-D7D0-45B8-AACD-57DF67D7089A}.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
+		{E5E427F0-D149-4992-AF31-F8616600E188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5E427F0-D149-4992-AF31-F8616600E188}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5E427F0-D149-4992-AF31-F8616600E188}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5E427F0-D149-4992-AF31-F8616600E188}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9CC71D46-5FAA-4CF2-BC86-A8BC89BFC4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CC71D46-5FAA-4CF2-BC86-A8BC89BFC4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9CC71D46-5FAA-4CF2-BC86-A8BC89BFC4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CC71D46-5FAA-4CF2-BC86-A8BC89BFC4F6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{508A7D81-6462-459C-9F8F-B58FCCCFC8E7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{81A05E2E-E3AE-4246-B4E6-DD5F31FB71F9} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{102247C1-3DB9-4DB5-80B3-EE9F80DD4E8F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3F87192A-32C0-4D92-A28C-D104FB86CBFB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CC136687-FDBD-4E35-9849-99D64A0D816B}
+		SolutionGuid = {FBAD4B5E-6059-47BF-A909-9D20CE67E4E0}
 	EndGlobalSection
 EndGlobal
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 01c6e1196e81f2..421b6eda997597 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,60 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng.Tests", "tests\System.Security.Cryptography.Cng.Tests.csproj", "{FF53459F-66F7-4F00-8D36-DF440CE18419}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4C1BD451-6A99-45E7-9339-79C77C42EE9E} = {4C1BD451-6A99-45E7-9339-79C77C42EE9E}
-	EndProjectSection
+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.Security.Cryptography.Cng", "src\System.Security.Cryptography.Cng.csproj", "{4C1BD451-6A99-45E7-9339-79C77C42EE9E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9FD12550-3A7C-49D3-9A1E-C4B7410989DD} = {9FD12550-3A7C-49D3-9A1E-C4B7410989DD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9A827563-B3C5-453F-B3BD-494283E21AC3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "ref\System.Security.Cryptography.Cng.csproj", "{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{28FC516D-19C2-43C6-BCBE-10273185673D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{39FEA352-F1A3-48AC-89FE-79E976218AC1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{38FDD4FD-E839-4FE1-882D-CC8E4CA89A55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2E55E921-96F9-409F-8C35-9822C7479E18}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "ref\System.Security.Cryptography.Cng.csproj", "{B88D8B7E-7682-4F23-82AF-DF186BDD3255}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "src\System.Security.Cryptography.Cng.csproj", "{4BAA22AA-6F42-4C31-8CCF-256F30A26228}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng.Tests", "tests\System.Security.Cryptography.Cng.Tests.csproj", "{4DCE069F-1F04-45F7-AA64-CE095F9DA385}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D2F806E8-EDDF-4F60-8CB1-0D9AD0F49D5D}"
+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}") = "tests", "tests", "{C60E2EAD-5AE6-4E89-9681-9C14CC90475A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2007BD8D-00ED-4E8C-8883-DC4B8351F2DA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C74E4669-E94E-4C31-8ECA-2CBFDF568A4F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7FAF92EB-F974-4279-8ED4-431ADAF3584C} = {C60E2EAD-5AE6-4E89-9681-9C14CC90475A}
+		{4DCE069F-1F04-45F7-AA64-CE095F9DA385} = {C60E2EAD-5AE6-4E89-9681-9C14CC90475A}
+		{9A827563-B3C5-453F-B3BD-494283E21AC3} = {2007BD8D-00ED-4E8C-8883-DC4B8351F2DA}
+		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078} = {2007BD8D-00ED-4E8C-8883-DC4B8351F2DA}
+		{38FDD4FD-E839-4FE1-882D-CC8E4CA89A55} = {2007BD8D-00ED-4E8C-8883-DC4B8351F2DA}
+		{B88D8B7E-7682-4F23-82AF-DF186BDD3255} = {2007BD8D-00ED-4E8C-8883-DC4B8351F2DA}
+		{D2F806E8-EDDF-4F60-8CB1-0D9AD0F49D5D} = {2007BD8D-00ED-4E8C-8883-DC4B8351F2DA}
+		{28FC516D-19C2-43C6-BCBE-10273185673D} = {C74E4669-E94E-4C31-8ECA-2CBFDF568A4F}
+		{39FEA352-F1A3-48AC-89FE-79E976218AC1} = {C74E4669-E94E-4C31-8ECA-2CBFDF568A4F}
+		{4BAA22AA-6F42-4C31-8CCF-256F30A26228} = {C74E4669-E94E-4C31-8ECA-2CBFDF568A4F}
+		{929388A9-0224-4FF8-867A-267E47A03311} = {C74E4669-E94E-4C31-8ECA-2CBFDF568A4F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF53459F-66F7-4F00-8D36-DF440CE18419}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF53459F-66F7-4F00-8D36-DF440CE18419}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C1BD451-6A99-45E7-9339-79C77C42EE9E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9FD12550-3A7C-49D3-9A1E-C4B7410989DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E55E921-96F9-409F-8C35-9822C7479E18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E55E921-96F9-409F-8C35-9822C7479E18}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E55E921-96F9-409F-8C35-9822C7479E18}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E55E921-96F9-409F-8C35-9822C7479E18}.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
+		{9A827563-B3C5-453F-B3BD-494283E21AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A827563-B3C5-453F-B3BD-494283E21AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A827563-B3C5-453F-B3BD-494283E21AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A827563-B3C5-453F-B3BD-494283E21AC3}.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
+		{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
+		{866AEC4B-C3DE-4F2C-B6E9-7628856FA078}.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
+		{38FDD4FD-E839-4FE1-882D-CC8E4CA89A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38FDD4FD-E839-4FE1-882D-CC8E4CA89A55}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38FDD4FD-E839-4FE1-882D-CC8E4CA89A55}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38FDD4FD-E839-4FE1-882D-CC8E4CA89A55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B88D8B7E-7682-4F23-82AF-DF186BDD3255}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{D2F806E8-EDDF-4F60-8CB1-0D9AD0F49D5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2F806E8-EDDF-4F60-8CB1-0D9AD0F49D5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2F806E8-EDDF-4F60-8CB1-0D9AD0F49D5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2F806E8-EDDF-4F60-8CB1-0D9AD0F49D5D}.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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FF53459F-66F7-4F00-8D36-DF440CE18419} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4C1BD451-6A99-45E7-9339-79C77C42EE9E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{9FD12550-3A7C-49D3-9A1E-C4B7410989DD} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{2E55E921-96F9-409F-8C35-9822C7479E18} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {946D0BC8-AC86-4941-8E28-FC386E071E93}
+		SolutionGuid = {219CF3E9-50CB-43C5-99B4-9F8B23255A31}
 	EndGlobalSection
 EndGlobal
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 caaf0c47714131..5d0e46e5d5d81d 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,60 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Csp.Tests", "tests\System.Security.Cryptography.Csp.Tests.csproj", "{A05C2EF2-A986-448C-9C63-735CC17409AA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E} = {3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}
-	EndProjectSection
+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.Security.Cryptography.Csp", "src\System.Security.Cryptography.Csp.csproj", "{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FD10679A-8C98-42E6-B7E5-9424E5443912} = {FD10679A-8C98-42E6-B7E5-9424E5443912}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FA8817A5-58CA-4FAE-9858-D5C3FD560D28}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Csp", "ref\System.Security.Cryptography.Csp.csproj", "{FD10679A-8C98-42E6-B7E5-9424E5443912}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{441BBB8B-D6D7-4518-83B6-687AFC2C6202}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{92E54CF3-47BF-4ABE-88FE-BE014A056C57}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{3A088210-D888-4407-801D-D4E9BDE42093}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\ref\System.Security.Cryptography.Cng.csproj", "{15F36B80-D084-471C-BF74-02841609486B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Csp", "ref\System.Security.Cryptography.Csp.csproj", "{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Csp", "src\System.Security.Cryptography.Csp.csproj", "{153000A6-96D2-4E0D-8E34-13B85E8ECACD}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{20628BA2-00CC-40F8-B319-7148ABB08896}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{87939B92-73C7-41D5-AFB0-44B5B717C4E9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E14C02BE-9BFD-4C28-88C4-3A00571D6AEE}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{CC4119F0-EEF6-4443-A3BD-D21063991D8B} = {87939B92-73C7-41D5-AFB0-44B5B717C4E9}
+		{9136AFBB-5173-4AD7-AD77-641E1EB8506C} = {87939B92-73C7-41D5-AFB0-44B5B717C4E9}
+		{FA8817A5-58CA-4FAE-9858-D5C3FD560D28} = {E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}
+		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF} = {E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}
+		{92E54CF3-47BF-4ABE-88FE-BE014A056C57} = {E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}
+		{15F36B80-D084-471C-BF74-02841609486B} = {E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}
+		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9} = {E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}
+		{20628BA2-00CC-40F8-B319-7148ABB08896} = {E8101C8F-FFDA-4997-8E8A-B9C77F3FE008}
+		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C} = {E14C02BE-9BFD-4C28-88C4-3A00571D6AEE}
+		{441BBB8B-D6D7-4518-83B6-687AFC2C6202} = {E14C02BE-9BFD-4C28-88C4-3A00571D6AEE}
+		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10} = {E14C02BE-9BFD-4C28-88C4-3A00571D6AEE}
+		{153000A6-96D2-4E0D-8E34-13B85E8ECACD} = {E14C02BE-9BFD-4C28-88C4-3A00571D6AEE}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A05C2EF2-A986-448C-9C63-735CC17409AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A05C2EF2-A986-448C-9C63-735CC17409AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD10679A-8C98-42E6-B7E5-9424E5443912}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD10679A-8C98-42E6-B7E5-9424E5443912}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD10679A-8C98-42E6-B7E5-9424E5443912}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD10679A-8C98-42E6-B7E5-9424E5443912}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A088210-D888-4407-801D-D4E9BDE42093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A088210-D888-4407-801D-D4E9BDE42093}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A088210-D888-4407-801D-D4E9BDE42093}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A088210-D888-4407-801D-D4E9BDE42093}.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
+		{CC4119F0-EEF6-4443-A3BD-D21063991D8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA8817A5-58CA-4FAE-9858-D5C3FD560D28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA8817A5-58CA-4FAE-9858-D5C3FD560D28}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA8817A5-58CA-4FAE-9858-D5C3FD560D28}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA8817A5-58CA-4FAE-9858-D5C3FD560D28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DA82AA17-5946-4454-B22E-11B3FC3F8D5C}.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
+		{3A94D2A7-DE56-4BDD-AFE4-5B936DE176BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{441BBB8B-D6D7-4518-83B6-687AFC2C6202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{92E54CF3-47BF-4ABE-88FE-BE014A056C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92E54CF3-47BF-4ABE-88FE-BE014A056C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92E54CF3-47BF-4ABE-88FE-BE014A056C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92E54CF3-47BF-4ABE-88FE-BE014A056C57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15F36B80-D084-471C-BF74-02841609486B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15F36B80-D084-471C-BF74-02841609486B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15F36B80-D084-471C-BF74-02841609486B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15F36B80-D084-471C-BF74-02841609486B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3CA5ECAF-C3E1-48F2-905F-BFEE4E164E10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D960CDE1-79C4-46A5-A0E3-3F49AB63DEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{20628BA2-00CC-40F8-B319-7148ABB08896}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20628BA2-00CC-40F8-B319-7148ABB08896}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20628BA2-00CC-40F8-B319-7148ABB08896}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20628BA2-00CC-40F8-B319-7148ABB08896}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A05C2EF2-A986-448C-9C63-735CC17409AA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3B7F91D7-0677-40CA-B4E7-D4E09D89A74E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{FD10679A-8C98-42E6-B7E5-9424E5443912} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{3A088210-D888-4407-801D-D4E9BDE42093} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {70B17739-0EEC-4B73-833E-E52683B5AEFF}
+		SolutionGuid = {C1FD6721-0F7E-4ACC-8409-4E518EA1C98A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln b/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
index 6aa9876e49a3b5..2ff5160f9785a8 100644
--- a/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
+++ b/src/libraries/System.Security.Cryptography.Encoding/System.Security.Cryptography.Encoding.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding.Tests", "tests\System.Security.Cryptography.Encoding.Tests.csproj", "{0581E9FA-D639-4B88-96D8-D092760F90B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AA81E343-5E54-40B0-9381-C459419BE780} = {AA81E343-5E54-40B0-9381-C459419BE780}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{201E9083-CCA0-4AA8-A2B2-B37AC13481E3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding", "src\System.Security.Cryptography.Encoding.csproj", "{AA81E343-5E54-40B0-9381-C459419BE780}"
-	ProjectSection(ProjectDependencies) = postProject
-		{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD} = {81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{6AFF6FDE-7B13-45B3-A492-C0DCA58E9004}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding", "ref\System.Security.Cryptography.Encoding.csproj", "{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{43B33B0D-4009-4838-B9F4-E5308C1827F7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{A7225A2D-C36C-473F-BD46-001A4CD836EE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding", "ref\System.Security.Cryptography.Encoding.csproj", "{465CB04B-D2D8-4E64-BA6D-571BE95391B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{8EA82BA5-5634-410C-8D76-8065D666F4F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding", "src\System.Security.Cryptography.Encoding.csproj", "{4B1D276E-6576-4F42-9F38-C91C95437F20}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Encoding.Tests", "tests\System.Security.Cryptography.Encoding.Tests.csproj", "{8A8D5FD7-557E-42EF-AA8A-5453E82574F2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{FBDCBFDB-0F6D-4C41-8D2D-E9CAB6C24500}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A73E4863-4F96-46E3-AF1B-3631C71A509D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{91CBF5BD-DA49-4787-975B-A49BC30CB6B0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AFACE727-34FE-4680-900D-9556A46832F8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{201E9083-CCA0-4AA8-A2B2-B37AC13481E3} = {A73E4863-4F96-46E3-AF1B-3631C71A509D}
+		{8A8D5FD7-557E-42EF-AA8A-5453E82574F2} = {A73E4863-4F96-46E3-AF1B-3631C71A509D}
+		{6AFF6FDE-7B13-45B3-A492-C0DCA58E9004} = {91CBF5BD-DA49-4787-975B-A49BC30CB6B0}
+		{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D} = {91CBF5BD-DA49-4787-975B-A49BC30CB6B0}
+		{A7225A2D-C36C-473F-BD46-001A4CD836EE} = {91CBF5BD-DA49-4787-975B-A49BC30CB6B0}
+		{465CB04B-D2D8-4E64-BA6D-571BE95391B4} = {91CBF5BD-DA49-4787-975B-A49BC30CB6B0}
+		{FBDCBFDB-0F6D-4C41-8D2D-E9CAB6C24500} = {91CBF5BD-DA49-4787-975B-A49BC30CB6B0}
+		{43B33B0D-4009-4838-B9F4-E5308C1827F7} = {AFACE727-34FE-4680-900D-9556A46832F8}
+		{4B1D276E-6576-4F42-9F38-C91C95437F20} = {AFACE727-34FE-4680-900D-9556A46832F8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0581E9FA-D639-4B88-96D8-D092760F90B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0581E9FA-D639-4B88-96D8-D092760F90B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AA81E343-5E54-40B0-9381-C459419BE780}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AA81E343-5E54-40B0-9381-C459419BE780}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8EA82BA5-5634-410C-8D76-8065D666F4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EA82BA5-5634-410C-8D76-8065D666F4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8EA82BA5-5634-410C-8D76-8065D666F4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EA82BA5-5634-410C-8D76-8065D666F4F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{201E9083-CCA0-4AA8-A2B2-B37AC13481E3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6AFF6FDE-7B13-45B3-A492-C0DCA58E9004}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6AFF6FDE-7B13-45B3-A492-C0DCA58E9004}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6AFF6FDE-7B13-45B3-A492-C0DCA58E9004}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6AFF6FDE-7B13-45B3-A492-C0DCA58E9004}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A428E072-E4DD-4F64-AFE3-DC9FC8D5563D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43B33B0D-4009-4838-B9F4-E5308C1827F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43B33B0D-4009-4838-B9F4-E5308C1827F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43B33B0D-4009-4838-B9F4-E5308C1827F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43B33B0D-4009-4838-B9F4-E5308C1827F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7225A2D-C36C-473F-BD46-001A4CD836EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7225A2D-C36C-473F-BD46-001A4CD836EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7225A2D-C36C-473F-BD46-001A4CD836EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7225A2D-C36C-473F-BD46-001A4CD836EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{465CB04B-D2D8-4E64-BA6D-571BE95391B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4B1D276E-6576-4F42-9F38-C91C95437F20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B1D276E-6576-4F42-9F38-C91C95437F20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B1D276E-6576-4F42-9F38-C91C95437F20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B1D276E-6576-4F42-9F38-C91C95437F20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A8D5FD7-557E-42EF-AA8A-5453E82574F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A8D5FD7-557E-42EF-AA8A-5453E82574F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A8D5FD7-557E-42EF-AA8A-5453E82574F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A8D5FD7-557E-42EF-AA8A-5453E82574F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FBDCBFDB-0F6D-4C41-8D2D-E9CAB6C24500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FBDCBFDB-0F6D-4C41-8D2D-E9CAB6C24500}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FBDCBFDB-0F6D-4C41-8D2D-E9CAB6C24500}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FBDCBFDB-0F6D-4C41-8D2D-E9CAB6C24500}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{0581E9FA-D639-4B88-96D8-D092760F90B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AA81E343-5E54-40B0-9381-C459419BE780} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{81B846C6-3CE3-4D7D-8A30-54ECEC63F6DD} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{8EA82BA5-5634-410C-8D76-8065D666F4F7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C0D18BF7-C6E6-42ED-B445-A20A40375EA0}
+		SolutionGuid = {FFED340A-44D5-49A5-8D41-F53CD3520C58}
 	EndGlobalSection
 EndGlobal
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 94842fb8277ac0..72bf9e1110164a 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,60 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl.Tests", "tests\System.Security.Cryptography.OpenSsl.Tests.csproj", "{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}"
-	ProjectSection(ProjectDependencies) = postProject
-		{78452F3E-BA91-47E7-BB0F-02E8A5C116C4} = {78452F3E-BA91-47E7-BB0F-02E8A5C116C4}
-	EndProjectSection
+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.Security.Cryptography.OpenSsl", "src\System.Security.Cryptography.OpenSsl.csproj", "{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8DEA82EF-2214-4295-8CC1-9FFB9B18838F} = {8DEA82EF-2214-4295-8CC1-9FFB9B18838F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{46747AE8-BF89-473A-9B3B-F0418390076C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "ref\System.Security.Cryptography.OpenSsl.csproj", "{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6C660B52-0FE3-43B9-838E-2F92B34E97D9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{41D067DF-C935-4F19-BE17-78122D39D629}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{42A6795A-8E6D-4328-B41E-6B1414043CEF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\ref\System.Security.Cryptography.Cng.csproj", "{0434D61E-39F7-45A1-8678-41E170E90EBA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{12345E87-4C47-4857-B7E4-6673D6ECC05F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "ref\System.Security.Cryptography.OpenSsl.csproj", "{5AC30FC5-0E64-4C71-AD80-FE758709E22B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "src\System.Security.Cryptography.OpenSsl.csproj", "{A0136D6F-CF53-42F8-9227-2FFF2A1841AA}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EDB4DEAC-FECE-4895-912B-CF75686EBFF1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{34D682B4-A2EE-4751-9D45-46278345EF44}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{8F2D30ED-D817-4BF6-8E0F-C329572D57E4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ABD163BE-B0F8-4704-A959-588EF6275320}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{29991657-E677-42A4-894C-6BE781C51DD7} = {34D682B4-A2EE-4751-9D45-46278345EF44}
+		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD} = {34D682B4-A2EE-4751-9D45-46278345EF44}
+		{46747AE8-BF89-473A-9B3B-F0418390076C} = {8F2D30ED-D817-4BF6-8E0F-C329572D57E4}
+		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1} = {8F2D30ED-D817-4BF6-8E0F-C329572D57E4}
+		{41D067DF-C935-4F19-BE17-78122D39D629} = {8F2D30ED-D817-4BF6-8E0F-C329572D57E4}
+		{0434D61E-39F7-45A1-8678-41E170E90EBA} = {8F2D30ED-D817-4BF6-8E0F-C329572D57E4}
+		{5AC30FC5-0E64-4C71-AD80-FE758709E22B} = {8F2D30ED-D817-4BF6-8E0F-C329572D57E4}
+		{EDB4DEAC-FECE-4895-912B-CF75686EBFF1} = {8F2D30ED-D817-4BF6-8E0F-C329572D57E4}
+		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4} = {ABD163BE-B0F8-4704-A959-588EF6275320}
+		{6C660B52-0FE3-43B9-838E-2F92B34E97D9} = {ABD163BE-B0F8-4704-A959-588EF6275320}
+		{12345E87-4C47-4857-B7E4-6673D6ECC05F} = {ABD163BE-B0F8-4704-A959-588EF6275320}
+		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA} = {ABD163BE-B0F8-4704-A959-588EF6275320}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78452F3E-BA91-47E7-BB0F-02E8A5C116C4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DEA82EF-2214-4295-8CC1-9FFB9B18838F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42A6795A-8E6D-4328-B41E-6B1414043CEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42A6795A-8E6D-4328-B41E-6B1414043CEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42A6795A-8E6D-4328-B41E-6B1414043CEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42A6795A-8E6D-4328-B41E-6B1414043CEF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29991657-E677-42A4-894C-6BE781C51DD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29991657-E677-42A4-894C-6BE781C51DD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29991657-E677-42A4-894C-6BE781C51DD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29991657-E677-42A4-894C-6BE781C51DD7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{46747AE8-BF89-473A-9B3B-F0418390076C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{46747AE8-BF89-473A-9B3B-F0418390076C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{46747AE8-BF89-473A-9B3B-F0418390076C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{46747AE8-BF89-473A-9B3B-F0418390076C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A84FF2B2-5272-4F02-AA2B-C0FA61586AA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7ED3F95-30B3-45E8-AD71-5B6A9F547EC1}.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
+		{6C660B52-0FE3-43B9-838E-2F92B34E97D9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41D067DF-C935-4F19-BE17-78122D39D629}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41D067DF-C935-4F19-BE17-78122D39D629}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41D067DF-C935-4F19-BE17-78122D39D629}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41D067DF-C935-4F19-BE17-78122D39D629}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0434D61E-39F7-45A1-8678-41E170E90EBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0434D61E-39F7-45A1-8678-41E170E90EBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0434D61E-39F7-45A1-8678-41E170E90EBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0434D61E-39F7-45A1-8678-41E170E90EBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12345E87-4C47-4857-B7E4-6673D6ECC05F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{5AC30FC5-0E64-4C71-AD80-FE758709E22B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5AC30FC5-0E64-4C71-AD80-FE758709E22B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5AC30FC5-0E64-4C71-AD80-FE758709E22B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5AC30FC5-0E64-4C71-AD80-FE758709E22B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A0136D6F-CF53-42F8-9227-2FFF2A1841AA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE8A9283-1375-4651-B1B0-4E5C6D1D07AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDB4DEAC-FECE-4895-912B-CF75686EBFF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDB4DEAC-FECE-4895-912B-CF75686EBFF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDB4DEAC-FECE-4895-912B-CF75686EBFF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDB4DEAC-FECE-4895-912B-CF75686EBFF1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E1DAF7B9-BECB-4D25-AABB-C9E0BC73C690} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{78452F3E-BA91-47E7-BB0F-02E8A5C116C4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{8DEA82EF-2214-4295-8CC1-9FFB9B18838F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{42A6795A-8E6D-4328-B41E-6B1414043CEF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {43A2E052-7F63-42D1-B22E-47C2A06358F4}
+		SolutionGuid = {46980D07-0EA0-4C0F-BCB8-C9557CE69B51}
 	EndGlobalSection
 EndGlobal
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 9d09f4f04d3054..1cbca23ab7c453 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,60 +1,107 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs.Tests", "tests\System.Security.Cryptography.Pkcs.Tests.csproj", "{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}"
-	ProjectSection(ProjectDependencies) = postProject
-		{03D84CBD-896D-4B2F-9A22-07034F51E73D} = {03D84CBD-896D-4B2F-9A22-07034F51E73D}
-	EndProjectSection
+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.Security.Cryptography.Pkcs", "src\System.Security.Cryptography.Pkcs.csproj", "{03D84CBD-896D-4B2F-9A22-07034F51E73D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{881269F5-9F22-4427-8DC5-63E2C05875BA} = {881269F5-9F22-4427-8DC5-63E2C05875BA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{14753A03-861F-40F0-A63F-FE53B7B7686B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "ref\System.Security.Cryptography.Pkcs.csproj", "{881269F5-9F22-4427-8DC5-63E2C05875BA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DA204355-86E3-431D-B08E-483A49BEB3DB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{AB6DADC6-C481-46AB-8F4C-2948E643B58B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{782B9BF3-D18E-4750-A88B-1D9F0E7CA55B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\ref\System.Security.Cryptography.Cng.csproj", "{4085C2AC-9B58-49D0-B9B5-C78D58393E2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{906CF937-8BCE-4ABF-B35C-23D51D59232E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "ref\System.Security.Cryptography.Pkcs.csproj", "{1AFD2D0A-B962-449B-AC3B-12ED1F439E91}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "src\System.Security.Cryptography.Pkcs.csproj", "{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{C2439BB4-69E6-4EC5-A46F-14BC4C055D2B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{76CCF857-F776-49CD-86CD-AFC78AAC32BC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1963587F-0608-47E5-B90F-F7C1849648E8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{6F930741-A5ED-401E-ABEE-77BEA461D9A5} = {76CCF857-F776-49CD-86CD-AFC78AAC32BC}
+		{2C8C1360-AC50-4493-BC0B-950149A875A3} = {76CCF857-F776-49CD-86CD-AFC78AAC32BC}
+		{14753A03-861F-40F0-A63F-FE53B7B7686B} = {DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}
+		{3DAFB198-0B50-4F31-A3A9-3826042431F5} = {DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}
+		{AB6DADC6-C481-46AB-8F4C-2948E643B58B} = {DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}
+		{4085C2AC-9B58-49D0-B9B5-C78D58393E2A} = {DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}
+		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91} = {DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}
+		{C2439BB4-69E6-4EC5-A46F-14BC4C055D2B} = {DC4BC75B-3419-4DE9-9B6D-B87E0829E35C}
+		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD} = {1963587F-0608-47E5-B90F-F7C1849648E8}
+		{DA204355-86E3-431D-B08E-483A49BEB3DB} = {1963587F-0608-47E5-B90F-F7C1849648E8}
+		{906CF937-8BCE-4ABF-B35C-23D51D59232E} = {1963587F-0608-47E5-B90F-F7C1849648E8}
+		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2} = {1963587F-0608-47E5-B90F-F7C1849648E8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{03D84CBD-896D-4B2F-9A22-07034F51E73D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{03D84CBD-896D-4B2F-9A22-07034F51E73D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{03D84CBD-896D-4B2F-9A22-07034F51E73D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{03D84CBD-896D-4B2F-9A22-07034F51E73D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{881269F5-9F22-4427-8DC5-63E2C05875BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{881269F5-9F22-4427-8DC5-63E2C05875BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{881269F5-9F22-4427-8DC5-63E2C05875BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{881269F5-9F22-4427-8DC5-63E2C05875BA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{782B9BF3-D18E-4750-A88B-1D9F0E7CA55B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{782B9BF3-D18E-4750-A88B-1D9F0E7CA55B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{782B9BF3-D18E-4750-A88B-1D9F0E7CA55B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{782B9BF3-D18E-4750-A88B-1D9F0E7CA55B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F930741-A5ED-401E-ABEE-77BEA461D9A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14753A03-861F-40F0-A63F-FE53B7B7686B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{14753A03-861F-40F0-A63F-FE53B7B7686B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14753A03-861F-40F0-A63F-FE53B7B7686B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{14753A03-861F-40F0-A63F-FE53B7B7686B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8D95486-BBE9-4AD2-9D7C-D5B7CF6B90FD}.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
+		{3DAFB198-0B50-4F31-A3A9-3826042431F5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DA204355-86E3-431D-B08E-483A49BEB3DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{AB6DADC6-C481-46AB-8F4C-2948E643B58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB6DADC6-C481-46AB-8F4C-2948E643B58B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB6DADC6-C481-46AB-8F4C-2948E643B58B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AB6DADC6-C481-46AB-8F4C-2948E643B58B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4085C2AC-9B58-49D0-B9B5-C78D58393E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4085C2AC-9B58-49D0-B9B5-C78D58393E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4085C2AC-9B58-49D0-B9B5-C78D58393E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4085C2AC-9B58-49D0-B9B5-C78D58393E2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{906CF937-8BCE-4ABF-B35C-23D51D59232E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{906CF937-8BCE-4ABF-B35C-23D51D59232E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{906CF937-8BCE-4ABF-B35C-23D51D59232E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{906CF937-8BCE-4ABF-B35C-23D51D59232E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1AFD2D0A-B962-449B-AC3B-12ED1F439E91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDD75646-C8BD-4B16-8E59-E6A3668FD9A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2C8C1360-AC50-4493-BC0B-950149A875A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2C8C1360-AC50-4493-BC0B-950149A875A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2C8C1360-AC50-4493-BC0B-950149A875A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2C8C1360-AC50-4493-BC0B-950149A875A3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2439BB4-69E6-4EC5-A46F-14BC4C055D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2439BB4-69E6-4EC5-A46F-14BC4C055D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2439BB4-69E6-4EC5-A46F-14BC4C055D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2439BB4-69E6-4EC5-A46F-14BC4C055D2B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2DD8DFFA-09FF-46C6-8313-4A9CC1849A44} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{03D84CBD-896D-4B2F-9A22-07034F51E73D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{881269F5-9F22-4427-8DC5-63E2C05875BA} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{782B9BF3-D18E-4750-A88B-1D9F0E7CA55B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7899FDA5-3069-403B-9243-D0B0363EF8E2}
+		SolutionGuid = {CF4AD1E7-1B60-4FDF-894F-7F0EF613012B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
index 374809c1fd76f3..d096014fc4be11 100644
--- a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
+++ b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives.Tests", "tests\System.Security.Cryptography.Primitives.Tests.csproj", "{101EB757-55A4-4F48-841C-C088640B8F57}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DF73E985-E143-4BF5-9FA4-E199E7D36235} = {DF73E985-E143-4BF5-9FA4-E199E7D36235}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives", "src\System.Security.Cryptography.Primitives.csproj", "{DF73E985-E143-4BF5-9FA4-E199E7D36235}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F050C895-297F-41C6-98C3-406D791AD515} = {F050C895-297F-41C6-98C3-406D791AD515}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{7F7293E9-FEEB-4148-8D66-03AD330A12AF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives", "ref\System.Security.Cryptography.Primitives.csproj", "{F050C895-297F-41C6-98C3-406D791AD515}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{B6CAEAD5-36A0-4F32-A80D-D6B152028945}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{483D067C-49EF-4501-B56A-02F540D96BE5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{76DAD859-77D8-4479-90D4-72FE05CF8368}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives", "ref\System.Security.Cryptography.Primitives.csproj", "{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{9D12B486-07A6-47DD-A4FC-4922BE3DD57D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives", "src\System.Security.Cryptography.Primitives.csproj", "{AF227727-11A6-4E5F-98DE-C362FC829633}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives.Tests", "tests\System.Security.Cryptography.Primitives.Tests.csproj", "{A242B3AB-EE45-4C95-9550-DB970BA23CD5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{ADE3B433-7388-44AB-B401-6BA23F3DF5D2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D60C311E-AA28-41EE-817F-CD26333E7378}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{42B3ABBC-EBAC-4DB3-8FDA-CBC3945EF03C}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{53F9B859-79CA-4E38-B569-6426DDA529AB}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{0C78AEB2-80BD-4B1B-B5CD-F038522D065D} = {D60C311E-AA28-41EE-817F-CD26333E7378}
+		{A242B3AB-EE45-4C95-9550-DB970BA23CD5} = {D60C311E-AA28-41EE-817F-CD26333E7378}
+		{7F7293E9-FEEB-4148-8D66-03AD330A12AF} = {42B3ABBC-EBAC-4DB3-8FDA-CBC3945EF03C}
+		{B6CAEAD5-36A0-4F32-A80D-D6B152028945} = {42B3ABBC-EBAC-4DB3-8FDA-CBC3945EF03C}
+		{76DAD859-77D8-4479-90D4-72FE05CF8368} = {42B3ABBC-EBAC-4DB3-8FDA-CBC3945EF03C}
+		{E9BF1F4D-7D5C-4539-B426-2FCCB2585138} = {42B3ABBC-EBAC-4DB3-8FDA-CBC3945EF03C}
+		{ADE3B433-7388-44AB-B401-6BA23F3DF5D2} = {42B3ABBC-EBAC-4DB3-8FDA-CBC3945EF03C}
+		{483D067C-49EF-4501-B56A-02F540D96BE5} = {53F9B859-79CA-4E38-B569-6426DDA529AB}
+		{AF227727-11A6-4E5F-98DE-C362FC829633} = {53F9B859-79CA-4E38-B569-6426DDA529AB}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{101EB757-55A4-4F48-841C-C088640B8F57}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{101EB757-55A4-4F48-841C-C088640B8F57}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DF73E985-E143-4BF5-9FA4-E199E7D36235}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DF73E985-E143-4BF5-9FA4-E199E7D36235}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F050C895-297F-41C6-98C3-406D791AD515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F050C895-297F-41C6-98C3-406D791AD515}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F050C895-297F-41C6-98C3-406D791AD515}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F050C895-297F-41C6-98C3-406D791AD515}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9D12B486-07A6-47DD-A4FC-4922BE3DD57D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9D12B486-07A6-47DD-A4FC-4922BE3DD57D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9D12B486-07A6-47DD-A4FC-4922BE3DD57D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9D12B486-07A6-47DD-A4FC-4922BE3DD57D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C78AEB2-80BD-4B1B-B5CD-F038522D065D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F7293E9-FEEB-4148-8D66-03AD330A12AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F7293E9-FEEB-4148-8D66-03AD330A12AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F7293E9-FEEB-4148-8D66-03AD330A12AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F7293E9-FEEB-4148-8D66-03AD330A12AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6CAEAD5-36A0-4F32-A80D-D6B152028945}.Release|Any CPU.Build.0 = Release|Any CPU
+		{483D067C-49EF-4501-B56A-02F540D96BE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{483D067C-49EF-4501-B56A-02F540D96BE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{483D067C-49EF-4501-B56A-02F540D96BE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{483D067C-49EF-4501-B56A-02F540D96BE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76DAD859-77D8-4479-90D4-72FE05CF8368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76DAD859-77D8-4479-90D4-72FE05CF8368}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76DAD859-77D8-4479-90D4-72FE05CF8368}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76DAD859-77D8-4479-90D4-72FE05CF8368}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9BF1F4D-7D5C-4539-B426-2FCCB2585138}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AF227727-11A6-4E5F-98DE-C362FC829633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AF227727-11A6-4E5F-98DE-C362FC829633}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AF227727-11A6-4E5F-98DE-C362FC829633}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AF227727-11A6-4E5F-98DE-C362FC829633}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A242B3AB-EE45-4C95-9550-DB970BA23CD5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADE3B433-7388-44AB-B401-6BA23F3DF5D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADE3B433-7388-44AB-B401-6BA23F3DF5D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADE3B433-7388-44AB-B401-6BA23F3DF5D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADE3B433-7388-44AB-B401-6BA23F3DF5D2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{101EB757-55A4-4F48-841C-C088640B8F57} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{DF73E985-E143-4BF5-9FA4-E199E7D36235} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F050C895-297F-41C6-98C3-406D791AD515} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{9D12B486-07A6-47DD-A4FC-4922BE3DD57D} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E69C9500-E894-44EA-8A1F-0BC23F3C878B}
+		SolutionGuid = {F5615383-F387-45EA-A05A-CB65D8A6FE88}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln b/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
index 4363c4d3fe6c07..f405d1179d45d6 100644
--- a/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
+++ b/src/libraries/System.Security.Cryptography.ProtectedData/System.Security.Cryptography.ProtectedData.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData.Tests", "tests\System.Security.Cryptography.ProtectedData.Tests.csproj", "{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FB39F994-1504-4B96-9588-E0385D3B73F1} = {FB39F994-1504-4B96-9588-E0385D3B73F1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "src\System.Security.Cryptography.ProtectedData.csproj", "{FB39F994-1504-4B96-9588-E0385D3B73F1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{28AA66B1-615B-462F-BD63-DC0A20052998} = {28AA66B1-615B-462F-BD63-DC0A20052998}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4248C69F-DFF2-4E47-9749-E12D1312F5D5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "ref\System.Security.Cryptography.ProtectedData.csproj", "{28AA66B1-615B-462F-BD63-DC0A20052998}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{179902DA-28E6-42F5-BA2D-905BEC68A32C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{C25543F0-E445-45AF-809D-388DF6496520}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "ref\System.Security.Cryptography.ProtectedData.csproj", "{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{D066EC34-EF43-4663-9D3D-F1C65685F81B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData", "src\System.Security.Cryptography.ProtectedData.csproj", "{7773DB7A-494F-4508-9471-F737FDC7661E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.ProtectedData.Tests", "tests\System.Security.Cryptography.ProtectedData.Tests.csproj", "{3A6C62D5-EFCA-4119-BC60-C917533848A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{B3C3180D-31E8-4225-8A5D-6765945C9647}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{4BF33DE6-1FFA-4CC3-92DA-02A6931B89FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E71CB63B-6EB0-473D-A2AE-487B7B280AB1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{60F975CB-2CC9-43E1-804B-9FB4142F49E8}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{21CC9F35-ACAA-4452-BE92-BBAE2E927B20} = {4BF33DE6-1FFA-4CC3-92DA-02A6931B89FD}
+		{3A6C62D5-EFCA-4119-BC60-C917533848A8} = {4BF33DE6-1FFA-4CC3-92DA-02A6931B89FD}
+		{4248C69F-DFF2-4E47-9749-E12D1312F5D5} = {E71CB63B-6EB0-473D-A2AE-487B7B280AB1}
+		{179902DA-28E6-42F5-BA2D-905BEC68A32C} = {E71CB63B-6EB0-473D-A2AE-487B7B280AB1}
+		{C25543F0-E445-45AF-809D-388DF6496520} = {E71CB63B-6EB0-473D-A2AE-487B7B280AB1}
+		{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE} = {E71CB63B-6EB0-473D-A2AE-487B7B280AB1}
+		{B3C3180D-31E8-4225-8A5D-6765945C9647} = {E71CB63B-6EB0-473D-A2AE-487B7B280AB1}
+		{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7} = {60F975CB-2CC9-43E1-804B-9FB4142F49E8}
+		{7773DB7A-494F-4508-9471-F737FDC7661E} = {60F975CB-2CC9-43E1-804B-9FB4142F49E8}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB39F994-1504-4B96-9588-E0385D3B73F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB39F994-1504-4B96-9588-E0385D3B73F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB39F994-1504-4B96-9588-E0385D3B73F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB39F994-1504-4B96-9588-E0385D3B73F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28AA66B1-615B-462F-BD63-DC0A20052998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28AA66B1-615B-462F-BD63-DC0A20052998}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28AA66B1-615B-462F-BD63-DC0A20052998}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28AA66B1-615B-462F-BD63-DC0A20052998}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D066EC34-EF43-4663-9D3D-F1C65685F81B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D066EC34-EF43-4663-9D3D-F1C65685F81B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D066EC34-EF43-4663-9D3D-F1C65685F81B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D066EC34-EF43-4663-9D3D-F1C65685F81B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21CC9F35-ACAA-4452-BE92-BBAE2E927B20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4248C69F-DFF2-4E47-9749-E12D1312F5D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4248C69F-DFF2-4E47-9749-E12D1312F5D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4248C69F-DFF2-4E47-9749-E12D1312F5D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4248C69F-DFF2-4E47-9749-E12D1312F5D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{179902DA-28E6-42F5-BA2D-905BEC68A32C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{179902DA-28E6-42F5-BA2D-905BEC68A32C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{179902DA-28E6-42F5-BA2D-905BEC68A32C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{179902DA-28E6-42F5-BA2D-905BEC68A32C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{90042C2E-6AD9-4BFF-B7CA-8E6BF9B3D3C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C25543F0-E445-45AF-809D-388DF6496520}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C25543F0-E445-45AF-809D-388DF6496520}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C25543F0-E445-45AF-809D-388DF6496520}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C25543F0-E445-45AF-809D-388DF6496520}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E40DBC0E-386A-4B32-8DCE-9FE13EAD47BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7773DB7A-494F-4508-9471-F737FDC7661E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7773DB7A-494F-4508-9471-F737FDC7661E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7773DB7A-494F-4508-9471-F737FDC7661E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7773DB7A-494F-4508-9471-F737FDC7661E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3A6C62D5-EFCA-4119-BC60-C917533848A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3A6C62D5-EFCA-4119-BC60-C917533848A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3A6C62D5-EFCA-4119-BC60-C917533848A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3A6C62D5-EFCA-4119-BC60-C917533848A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3C3180D-31E8-4225-8A5D-6765945C9647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3C3180D-31E8-4225-8A5D-6765945C9647}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3C3180D-31E8-4225-8A5D-6765945C9647}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3C3180D-31E8-4225-8A5D-6765945C9647}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{749ED7AD-E3C1-4611-99BD-C5D4B3934B3A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{FB39F994-1504-4B96-9588-E0385D3B73F1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{28AA66B1-615B-462F-BD63-DC0A20052998} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{D066EC34-EF43-4663-9D3D-F1C65685F81B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {69CE1761-488C-47EA-BDAD-8A34ED736BE8}
+		SolutionGuid = {FB101479-5EAB-495B-ACF3-4B6FC3F830EF}
 	EndGlobalSection
 EndGlobal
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 a0dd5aa9512b4e..87151a3549c63b 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,60 +1,135 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.X509Certificates.Tests", "tests\System.Security.Cryptography.X509Certificates.Tests.csproj", "{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6F8576C2-6CD0-4DF3-8394-00B002D82E40} = {6F8576C2-6CD0-4DF3-8394-00B002D82E40}
-	EndProjectSection
+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.Security.Cryptography.X509Certificates", "src\System.Security.Cryptography.X509Certificates.csproj", "{6F8576C2-6CD0-4DF3-8394-00B002D82E40}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B37248D0-B191-4971-AD50-01CFEDF1E09B} = {B37248D0-B191-4971-AD50-01CFEDF1E09B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{855567D5-A188-405D-BCC0-8769098813A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.X509Certificates", "ref\System.Security.Cryptography.X509Certificates.csproj", "{B37248D0-B191-4971-AD50-01CFEDF1E09B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Formats.Asn1", "..\System.Formats.Asn1\src\System.Formats.Asn1.csproj", "{C2D74126-653E-41C9-9CF8-E58F1FD110B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{52FC346D-2936-43FD-93A6-02F019A5F5EC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{829DAB88-0339-4F92-A954-E5586FDC0A7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B10D4AA3-247D-498A-84DD-ABAE8FE65093}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\ref\System.Security.Cryptography.Cng.csproj", "{3F8B63DA-BE4E-4580-A904-C047EA4A7347}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Cng", "..\System.Security.Cryptography.Cng\src\System.Security.Cryptography.Cng.csproj", "{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\ref\System.Security.Cryptography.OpenSsl.csproj", "{D1909495-B957-4A31-BC79-04AA3F5C5E0F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.OpenSsl", "..\System.Security.Cryptography.OpenSsl\src\System.Security.Cryptography.OpenSsl.csproj", "{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\ref\System.Security.Cryptography.Pkcs.csproj", "{9E04AD65-21BC-4FF4-B38C-9B17488AACA5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Pkcs", "..\System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj", "{76812DB0-A6A2-4F0C-B560-18FC7A97E419}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.X509Certificates", "ref\System.Security.Cryptography.X509Certificates.csproj", "{4EC57148-D181-49B9-BDAF-1735D4687C79}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.X509Certificates", "src\System.Security.Cryptography.X509Certificates.csproj", "{2A203F48-05D2-4E45-8A98-98F02EE639A8}"
+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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{0059505B-9A88-4FC5-8583-E497ECFEA0F4}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0B0B3B2F-E47A-46AA-84AA-69A5E344AC63}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{098568FC-B917-4AC9-8919-94D6653C38E0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{283892D1-8C1C-4826-BE27-C84BF99DD98E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{FC10D700-60DF-4D00-9433-47DFC3E3DC26} = {0B0B3B2F-E47A-46AA-84AA-69A5E344AC63}
+		{53F1E058-B5A4-4348-9BE6-8B006A6861AF} = {0B0B3B2F-E47A-46AA-84AA-69A5E344AC63}
+		{855567D5-A188-405D-BCC0-8769098813A5} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{201E349A-1CC7-4591-8332-29BEBF3DAA49} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{829DAB88-0339-4F92-A954-E5586FDC0A7A} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{3F8B63DA-BE4E-4580-A904-C047EA4A7347} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{D1909495-B957-4A31-BC79-04AA3F5C5E0F} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{4EC57148-D181-49B9-BDAF-1735D4687C79} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{0059505B-9A88-4FC5-8583-E497ECFEA0F4} = {098568FC-B917-4AC9-8919-94D6653C38E0}
+		{C2D74126-653E-41C9-9CF8-E58F1FD110B8} = {283892D1-8C1C-4826-BE27-C84BF99DD98E}
+		{52FC346D-2936-43FD-93A6-02F019A5F5EC} = {283892D1-8C1C-4826-BE27-C84BF99DD98E}
+		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357} = {283892D1-8C1C-4826-BE27-C84BF99DD98E}
+		{97BBCB3E-6924-4EE7-94AD-9B2B793A7ABD} = {283892D1-8C1C-4826-BE27-C84BF99DD98E}
+		{76812DB0-A6A2-4F0C-B560-18FC7A97E419} = {283892D1-8C1C-4826-BE27-C84BF99DD98E}
+		{2A203F48-05D2-4E45-8A98-98F02EE639A8} = {283892D1-8C1C-4826-BE27-C84BF99DD98E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A28B0064-EFB2-4B77-B97C-DECF5DAB074E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F8576C2-6CD0-4DF3-8394-00B002D82E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B37248D0-B191-4971-AD50-01CFEDF1E09B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B37248D0-B191-4971-AD50-01CFEDF1E09B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B37248D0-B191-4971-AD50-01CFEDF1E09B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B37248D0-B191-4971-AD50-01CFEDF1E09B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B10D4AA3-247D-498A-84DD-ABAE8FE65093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B10D4AA3-247D-498A-84DD-ABAE8FE65093}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B10D4AA3-247D-498A-84DD-ABAE8FE65093}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B10D4AA3-247D-498A-84DD-ABAE8FE65093}.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
+		{FC10D700-60DF-4D00-9433-47DFC3E3DC26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{855567D5-A188-405D-BCC0-8769098813A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{855567D5-A188-405D-BCC0-8769098813A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{855567D5-A188-405D-BCC0-8769098813A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{855567D5-A188-405D-BCC0-8769098813A5}.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
+		{C2D74126-653E-41C9-9CF8-E58F1FD110B8}.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
+		{201E349A-1CC7-4591-8332-29BEBF3DAA49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52FC346D-2936-43FD-93A6-02F019A5F5EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{829DAB88-0339-4F92-A954-E5586FDC0A7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{829DAB88-0339-4F92-A954-E5586FDC0A7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{829DAB88-0339-4F92-A954-E5586FDC0A7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{829DAB88-0339-4F92-A954-E5586FDC0A7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F8B63DA-BE4E-4580-A904-C047EA4A7347}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F8B63DA-BE4E-4580-A904-C047EA4A7347}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F8B63DA-BE4E-4580-A904-C047EA4A7347}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F8B63DA-BE4E-4580-A904-C047EA4A7347}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEFBEDAF-C620-4C4E-867E-80A1EFEC4357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{D1909495-B957-4A31-BC79-04AA3F5C5E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1909495-B957-4A31-BC79-04AA3F5C5E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1909495-B957-4A31-BC79-04AA3F5C5E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1909495-B957-4A31-BC79-04AA3F5C5E0F}.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
+		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E04AD65-21BC-4FF4-B38C-9B17488AACA5}.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
+		{4EC57148-D181-49B9-BDAF-1735D4687C79}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{0059505B-9A88-4FC5-8583-E497ECFEA0F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0059505B-9A88-4FC5-8583-E497ECFEA0F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0059505B-9A88-4FC5-8583-E497ECFEA0F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0059505B-9A88-4FC5-8583-E497ECFEA0F4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A28B0064-EFB2-4B77-B97C-DECF5DAB074E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6F8576C2-6CD0-4DF3-8394-00B002D82E40} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B37248D0-B191-4971-AD50-01CFEDF1E09B} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{B10D4AA3-247D-498A-84DD-ABAE8FE65093} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F153909E-6E31-4502-B353-AAA99D13C50D}
+		SolutionGuid = {5ED3739E-C629-4900-BC1B-DF714AB4BB45}
 	EndGlobalSection
 EndGlobal
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 4fa94c1febf0de..ba354295d577a3 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
@@ -1,60 +1,135 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml.Tests", "tests\System.Security.Cryptography.Xml.Tests.csproj", "{4A85232C-E914-4E06-8542-26DAF4B22D60}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A} = {0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "src\System.Security.Cryptography.Xml.csproj", "{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C7266957-DB20-4250-9C2E-E1FF83EDBD71} = {C7266957-DB20-4250-9C2E-E1FF83EDBD71}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{20F477F1-0708-43AF-9521-69C8DB54AA46}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "ref\System.Security.Cryptography.Xml.csproj", "{C7266957-DB20-4250-9C2E-E1FF83EDBD71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{F2034D74-55F1-4055-AC85-12F80A7E56CD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+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}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{158DDF64-D678-492E-A38A-0EE12E096F84}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{504B9542-8D3F-4E86-B3DA-CC3B009337F2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{50DC25BA-7590-40F0-B579-402F51040995}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{4F5D04A1-AB8E-4EDF-92B1-534DB2977FA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "ref\System.Security.Cryptography.Xml.csproj", "{2BB35F95-AD1A-45D3-B8E2-84CC690073A8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml", "src\System.Security.Cryptography.Xml.csproj", "{848640EF-9F7D-4D01-AA87-E16617FDEE0B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Xml.Tests", "tests\System.Security.Cryptography.Xml.Tests.csproj", "{675D4EE3-1F0E-4445-A9CD-635ED3351751}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{42320794-D862-4CD4-9D67-F667A8820AA6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{B52971E5-EABD-4BE9-942A-EDAA290DB09B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{024A3245-5F94-4EFA-A8E7-4F68BC3AB578}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{6D66988A-4D72-466B-ADE2-2011C5906A2A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{28200C76-F42D-4E11-B948-C8D9193A58A1}"
+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}") = "tests", "tests", "{928942C8-844E-4108-BB56-385FC622C0A2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{42C92222-6242-4374-8D45-7A79EA117479}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B3180E55-B9B3-4B71-8A52-DDDCB3E39F77} = {928942C8-844E-4108-BB56-385FC622C0A2}
+		{675D4EE3-1F0E-4445-A9CD-635ED3351751} = {928942C8-844E-4108-BB56-385FC622C0A2}
+		{20F477F1-0708-43AF-9521-69C8DB54AA46} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{F2034D74-55F1-4055-AC85-12F80A7E56CD} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{FB3C7609-962F-4414-8702-B3D4121AC51B} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{504B9542-8D3F-4E86-B3DA-CC3B009337F2} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{42320794-D862-4CD4-9D67-F667A8820AA6} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{024A3245-5F94-4EFA-A8E7-4F68BC3AB578} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{28200C76-F42D-4E11-B948-C8D9193A58A1} = {DC2A53DC-8E9A-4395-B01A-54BBC4CAB49F}
+		{158DDF64-D678-492E-A38A-0EE12E096F84} = {42C92222-6242-4374-8D45-7A79EA117479}
+		{4F5D04A1-AB8E-4EDF-92B1-534DB2977FA2} = {42C92222-6242-4374-8D45-7A79EA117479}
+		{848640EF-9F7D-4D01-AA87-E16617FDEE0B} = {42C92222-6242-4374-8D45-7A79EA117479}
+		{B52971E5-EABD-4BE9-942A-EDAA290DB09B} = {42C92222-6242-4374-8D45-7A79EA117479}
+		{6D66988A-4D72-466B-ADE2-2011C5906A2A} = {42C92222-6242-4374-8D45-7A79EA117479}
+		{404253AC-EAFF-488F-8980-2249F4703278} = {42C92222-6242-4374-8D45-7A79EA117479}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4A85232C-E914-4E06-8542-26DAF4B22D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A85232C-E914-4E06-8542-26DAF4B22D60}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A85232C-E914-4E06-8542-26DAF4B22D60}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A85232C-E914-4E06-8542-26DAF4B22D60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7266957-DB20-4250-9C2E-E1FF83EDBD71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7266957-DB20-4250-9C2E-E1FF83EDBD71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7266957-DB20-4250-9C2E-E1FF83EDBD71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7266957-DB20-4250-9C2E-E1FF83EDBD71}.Release|Any CPU.Build.0 = Release|Any CPU
-		{50DC25BA-7590-40F0-B579-402F51040995}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{50DC25BA-7590-40F0-B579-402F51040995}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{50DC25BA-7590-40F0-B579-402F51040995}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{50DC25BA-7590-40F0-B579-402F51040995}.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
+		{20F477F1-0708-43AF-9521-69C8DB54AA46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20F477F1-0708-43AF-9521-69C8DB54AA46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20F477F1-0708-43AF-9521-69C8DB54AA46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20F477F1-0708-43AF-9521-69C8DB54AA46}.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
+		{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
+		{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
+		{158DDF64-D678-492E-A38A-0EE12E096F84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{504B9542-8D3F-4E86-B3DA-CC3B009337F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{504B9542-8D3F-4E86-B3DA-CC3B009337F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{504B9542-8D3F-4E86-B3DA-CC3B009337F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{504B9542-8D3F-4E86-B3DA-CC3B009337F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F5D04A1-AB8E-4EDF-92B1-534DB2977FA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F5D04A1-AB8E-4EDF-92B1-534DB2977FA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F5D04A1-AB8E-4EDF-92B1-534DB2977FA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F5D04A1-AB8E-4EDF-92B1-534DB2977FA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2BB35F95-AD1A-45D3-B8E2-84CC690073A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{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
+		{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
+		{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
+		{024A3245-5F94-4EFA-A8E7-4F68BC3AB578}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{024A3245-5F94-4EFA-A8E7-4F68BC3AB578}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{024A3245-5F94-4EFA-A8E7-4F68BC3AB578}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{024A3245-5F94-4EFA-A8E7-4F68BC3AB578}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D66988A-4D72-466B-ADE2-2011C5906A2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D66988A-4D72-466B-ADE2-2011C5906A2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D66988A-4D72-466B-ADE2-2011C5906A2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D66988A-4D72-466B-ADE2-2011C5906A2A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28200C76-F42D-4E11-B948-C8D9193A58A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{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
+		{404253AC-EAFF-488F-8980-2249F4703278}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{4A85232C-E914-4E06-8542-26DAF4B22D60} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0544EAE3-0CF2-4EA6-93BE-A9FF8B52724A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C7266957-DB20-4250-9C2E-E1FF83EDBD71} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{50DC25BA-7590-40F0-B579-402F51040995} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {53A61DC6-1798-4086-97EA-EBBF9FE9D6D1}
+		SolutionGuid = {E0287BE2-B499-4885-8EE8-0B35585CA885}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
index 5e7b33d99a32a8..2a7b54421aedc9 100644
--- a/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
+++ b/src/libraries/System.Security.Permissions/System.Security.Permissions.sln
@@ -1,60 +1,149 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions.Tests", "tests\System.Security.Permissions.Tests.csproj", "{7517F1E9-EEB4-4676-A054-CE4A44A66B66}"
-	ProjectSection(ProjectDependencies) = postProject
-		{07390899-C8F6-4E83-A3A9-6867B8CB46A0} = {07390899-C8F6-4E83-A3A9-6867B8CB46A0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{74374CDE-23F8-4041-8F94-D5CBC23735C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "src\System.Security.Permissions.csproj", "{07390899-C8F6-4E83-A3A9-6867B8CB46A0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{07CAF142-B259-418E-86EF-C4BD8B50253E} = {07CAF142-B259-418E-86EF-C4BD8B50253E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{2EC16C81-3395-4603-A760-AF9E5623CF1D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "ref\System.Security.Permissions.csproj", "{07CAF142-B259-418E-86EF-C4BD8B50253E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\ref\System.DirectoryServices.csproj", "{A629F9A5-1EA5-475F-9A49-29C81198CF34}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.DirectoryServices", "..\System.DirectoryServices\src\System.DirectoryServices.csproj", "{7E64D2D1-7ED9-490A-B658-5E2162F571D6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{E71E8D52-CF85-4713-9634-EB04CAE7F21A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{425A517E-3019-42B3-8716-A1B076B60E71}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2099802E-5EA6-4EAB-8EE0-2BB2B1AD0B71}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{81617FB4-9B76-41C2-9F20-085C6DAB2058}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{85FEB4C5-8566-4FEB-925B-C49B8EB10B66}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A4AC5507-621D-4651-89D9-DB2444697CFF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{58A475C8-2753-44A7-8BB8-D4D5C86830D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{21DAD828-003D-4FB4-9F2B-4B4295DA5E06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "ref\System.Security.Permissions.csproj", "{F238F227-522D-4886-A6B5-474948B3C660}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "src\System.Security.Permissions.csproj", "{CE88C6B8-C9B6-4695-BA23-BE8955018E26}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions.Tests", "tests\System.Security.Permissions.Tests.csproj", "{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{96AFAA70-4823-4350-89E7-DBB28EC2B7B9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{01B09A8A-148B-410B-8905-33B14C3EBA8D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EF5BF55A-14FA-424D-87DB-A902EADF398E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BFAF2236-6772-469A-9F4F-01D3DC76AC50}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{41EB5802-6C84-43F7-996D-FF2762D44206}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6} = {EF5BF55A-14FA-424D-87DB-A902EADF398E}
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1} = {EF5BF55A-14FA-424D-87DB-A902EADF398E}
+		{2EC16C81-3395-4603-A760-AF9E5623CF1D} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{E71E8D52-CF85-4713-9634-EB04CAE7F21A} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{425A517E-3019-42B3-8716-A1B076B60E71} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{85FEB4C5-8566-4FEB-925B-C49B8EB10B66} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{58A475C8-2753-44A7-8BB8-D4D5C86830D8} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{F238F227-522D-4886-A6B5-474948B3C660} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{96AFAA70-4823-4350-89E7-DBB28EC2B7B9} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358} = {BFAF2236-6772-469A-9F4F-01D3DC76AC50}
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+		{81617FB4-9B76-41C2-9F20-085C6DAB2058} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+		{A4AC5507-621D-4651-89D9-DB2444697CFF} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+		{21DAD828-003D-4FB4-9F2B-4B4295DA5E06} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+		{01B09A8A-148B-410B-8905-33B14C3EBA8D} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD} = {41EB5802-6C84-43F7-996D-FF2762D44206}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7517F1E9-EEB4-4676-A054-CE4A44A66B66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07390899-C8F6-4E83-A3A9-6867B8CB46A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07CAF142-B259-418E-86EF-C4BD8B50253E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07CAF142-B259-418E-86EF-C4BD8B50253E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07CAF142-B259-418E-86EF-C4BD8B50253E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07CAF142-B259-418E-86EF-C4BD8B50253E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2099802E-5EA6-4EAB-8EE0-2BB2B1AD0B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2099802E-5EA6-4EAB-8EE0-2BB2B1AD0B71}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2099802E-5EA6-4EAB-8EE0-2BB2B1AD0B71}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2099802E-5EA6-4EAB-8EE0-2BB2B1AD0B71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{74374CDE-23F8-4041-8F94-D5CBC23735C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EC16C81-3395-4603-A760-AF9E5623CF1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EC16C81-3395-4603-A760-AF9E5623CF1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EC16C81-3395-4603-A760-AF9E5623CF1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2EC16C81-3395-4603-A760-AF9E5623CF1D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A629F9A5-1EA5-475F-9A49-29C81198CF34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7E64D2D1-7ED9-490A-B658-5E2162F571D6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E71E8D52-CF85-4713-9634-EB04CAE7F21A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E71E8D52-CF85-4713-9634-EB04CAE7F21A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E71E8D52-CF85-4713-9634-EB04CAE7F21A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E71E8D52-CF85-4713-9634-EB04CAE7F21A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{425A517E-3019-42B3-8716-A1B076B60E71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{425A517E-3019-42B3-8716-A1B076B60E71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{425A517E-3019-42B3-8716-A1B076B60E71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{425A517E-3019-42B3-8716-A1B076B60E71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{81617FB4-9B76-41C2-9F20-085C6DAB2058}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{81617FB4-9B76-41C2-9F20-085C6DAB2058}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{81617FB4-9B76-41C2-9F20-085C6DAB2058}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{81617FB4-9B76-41C2-9F20-085C6DAB2058}.Release|Any CPU.Build.0 = Release|Any CPU
+		{85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{85FEB4C5-8566-4FEB-925B-C49B8EB10B66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4AC5507-621D-4651-89D9-DB2444697CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4AC5507-621D-4651-89D9-DB2444697CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4AC5507-621D-4651-89D9-DB2444697CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4AC5507-621D-4651-89D9-DB2444697CFF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58A475C8-2753-44A7-8BB8-D4D5C86830D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58A475C8-2753-44A7-8BB8-D4D5C86830D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58A475C8-2753-44A7-8BB8-D4D5C86830D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58A475C8-2753-44A7-8BB8-D4D5C86830D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21DAD828-003D-4FB4-9F2B-4B4295DA5E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21DAD828-003D-4FB4-9F2B-4B4295DA5E06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21DAD828-003D-4FB4-9F2B-4B4295DA5E06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21DAD828-003D-4FB4-9F2B-4B4295DA5E06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F238F227-522D-4886-A6B5-474948B3C660}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE88C6B8-C9B6-4695-BA23-BE8955018E26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9CD9B45-D3AC-433F-B316-6DB40FCCC8F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96AFAA70-4823-4350-89E7-DBB28EC2B7B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96AFAA70-4823-4350-89E7-DBB28EC2B7B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96AFAA70-4823-4350-89E7-DBB28EC2B7B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96AFAA70-4823-4350-89E7-DBB28EC2B7B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{01B09A8A-148B-410B-8905-33B14C3EBA8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{01B09A8A-148B-410B-8905-33B14C3EBA8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{01B09A8A-148B-410B-8905-33B14C3EBA8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{01B09A8A-148B-410B-8905-33B14C3EBA8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19AB8565-1ADA-4E64-B5C8-FD2DA7525358}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F2FF3B73-B971-4C07-B9C9-9EA600C288BD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{7517F1E9-EEB4-4676-A054-CE4A44A66B66} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{07390899-C8F6-4E83-A3A9-6867B8CB46A0} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{07CAF142-B259-418E-86EF-C4BD8B50253E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{2099802E-5EA6-4EAB-8EE0-2BB2B1AD0B71} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {4BAFEB16-A9FB-4A42-BA81-FDEF4EFF0E36}
+		SolutionGuid = {3A482AFF-93CE-43E0-9C2A-64424A25D364}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln b/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
index 94db410b84bdbe..ffde9a866a4184 100644
--- a/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
+++ b/src/libraries/System.Security.Principal.Windows/System.Security.Principal.Windows.sln
@@ -1,60 +1,79 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows.Tests", "tests\System.Security.Principal.Windows.Tests.csproj", "{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F9E9894E-2513-4085-9046-311AD49D8AE6} = {F9E9894E-2513-4085-9046-311AD49D8AE6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1F05702D-1F77-4EA3-AFB2-94893104F248}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "src\System.Security.Principal.Windows.csproj", "{F9E9894E-2513-4085-9046-311AD49D8AE6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{25A02E40-D12C-4184-B599-E4F954D142DB} = {25A02E40-D12C-4184-B599-E4F954D142DB}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{DBF0307E-E88A-4155-85AC-E532BE33AE14}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "ref\System.Security.Principal.Windows.csproj", "{25A02E40-D12C-4184-B599-E4F954D142DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{61C7DD7C-76A8-4103-89B6-13A819871E20}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{C4E3304E-6916-4352-BD79-AE4274B75A1E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{116A2823-528E-4BE7-8DD7-0E4118285542}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "ref\System.Security.Principal.Windows.csproj", "{F6A57CBE-E4F4-444A-8CFA-918D1124BC93}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{348DFAFA-6DBE-4FAA-9990-DC50E9AC416B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "src\System.Security.Principal.Windows.csproj", "{AA2C3AEB-53FA-4F69-8769-89DCE8221299}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows.Tests", "tests\System.Security.Principal.Windows.Tests.csproj", "{9310D24A-AB63-4CB0-9718-A8C2D57C20FE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BFA40A55-F5F4-415B-B4EA-EBCC626E20A8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{922AF82E-D993-4FA1-B076-0342CB45A156}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{56A50198-EEDC-4AA8-9C5B-E7A4372914A6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1F05702D-1F77-4EA3-AFB2-94893104F248} = {BFA40A55-F5F4-415B-B4EA-EBCC626E20A8}
+		{9310D24A-AB63-4CB0-9718-A8C2D57C20FE} = {BFA40A55-F5F4-415B-B4EA-EBCC626E20A8}
+		{DBF0307E-E88A-4155-85AC-E532BE33AE14} = {922AF82E-D993-4FA1-B076-0342CB45A156}
+		{61C7DD7C-76A8-4103-89B6-13A819871E20} = {922AF82E-D993-4FA1-B076-0342CB45A156}
+		{116A2823-528E-4BE7-8DD7-0E4118285542} = {922AF82E-D993-4FA1-B076-0342CB45A156}
+		{F6A57CBE-E4F4-444A-8CFA-918D1124BC93} = {922AF82E-D993-4FA1-B076-0342CB45A156}
+		{C4E3304E-6916-4352-BD79-AE4274B75A1E} = {56A50198-EEDC-4AA8-9C5B-E7A4372914A6}
+		{AA2C3AEB-53FA-4F69-8769-89DCE8221299} = {56A50198-EEDC-4AA8-9C5B-E7A4372914A6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C36F3AC-54A1-4021-9F5D-CDEFF7347277}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9E9894E-2513-4085-9046-311AD49D8AE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9E9894E-2513-4085-9046-311AD49D8AE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9E9894E-2513-4085-9046-311AD49D8AE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9E9894E-2513-4085-9046-311AD49D8AE6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25A02E40-D12C-4184-B599-E4F954D142DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25A02E40-D12C-4184-B599-E4F954D142DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25A02E40-D12C-4184-B599-E4F954D142DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25A02E40-D12C-4184-B599-E4F954D142DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{348DFAFA-6DBE-4FAA-9990-DC50E9AC416B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{348DFAFA-6DBE-4FAA-9990-DC50E9AC416B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{348DFAFA-6DBE-4FAA-9990-DC50E9AC416B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{348DFAFA-6DBE-4FAA-9990-DC50E9AC416B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F05702D-1F77-4EA3-AFB2-94893104F248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F05702D-1F77-4EA3-AFB2-94893104F248}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F05702D-1F77-4EA3-AFB2-94893104F248}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F05702D-1F77-4EA3-AFB2-94893104F248}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DBF0307E-E88A-4155-85AC-E532BE33AE14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DBF0307E-E88A-4155-85AC-E532BE33AE14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DBF0307E-E88A-4155-85AC-E532BE33AE14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DBF0307E-E88A-4155-85AC-E532BE33AE14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61C7DD7C-76A8-4103-89B6-13A819871E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61C7DD7C-76A8-4103-89B6-13A819871E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61C7DD7C-76A8-4103-89B6-13A819871E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61C7DD7C-76A8-4103-89B6-13A819871E20}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C4E3304E-6916-4352-BD79-AE4274B75A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C4E3304E-6916-4352-BD79-AE4274B75A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4E3304E-6916-4352-BD79-AE4274B75A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C4E3304E-6916-4352-BD79-AE4274B75A1E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{116A2823-528E-4BE7-8DD7-0E4118285542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{116A2823-528E-4BE7-8DD7-0E4118285542}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{116A2823-528E-4BE7-8DD7-0E4118285542}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{116A2823-528E-4BE7-8DD7-0E4118285542}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6A57CBE-E4F4-444A-8CFA-918D1124BC93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6A57CBE-E4F4-444A-8CFA-918D1124BC93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6A57CBE-E4F4-444A-8CFA-918D1124BC93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6A57CBE-E4F4-444A-8CFA-918D1124BC93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA2C3AEB-53FA-4F69-8769-89DCE8221299}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA2C3AEB-53FA-4F69-8769-89DCE8221299}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA2C3AEB-53FA-4F69-8769-89DCE8221299}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA2C3AEB-53FA-4F69-8769-89DCE8221299}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9310D24A-AB63-4CB0-9718-A8C2D57C20FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9310D24A-AB63-4CB0-9718-A8C2D57C20FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9310D24A-AB63-4CB0-9718-A8C2D57C20FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9310D24A-AB63-4CB0-9718-A8C2D57C20FE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{6C36F3AC-54A1-4021-9F5D-CDEFF7347277} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F9E9894E-2513-4085-9046-311AD49D8AE6} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{25A02E40-D12C-4184-B599-E4F954D142DB} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{348DFAFA-6DBE-4FAA-9990-DC50E9AC416B} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C1987ECC-F822-45E1-8652-9C4CE1E41A88}
+		SolutionGuid = {F45E7C49-4541-4445-ADF1-DD57AF4E13F5}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.Principal/System.Security.Principal.sln b/src/libraries/System.Security.Principal/System.Security.Principal.sln
index 60d609020e8d11..6dc143b24f5891 100644
--- a/src/libraries/System.Security.Principal/System.Security.Principal.sln
+++ b/src/libraries/System.Security.Principal/System.Security.Principal.sln
@@ -1,41 +1,85 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal", "src\System.Security.Principal.csproj", "{FBE16BC8-AE2D-422C-861E-861814F53AF7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06ECBECD-4100-474D-8F3C-21A0F66A92A6} = {06ECBECD-4100-474D-8F3C-21A0F66A92A6}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{45602EBE-1508-43A8-A398-1B92BD243557}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal", "ref\System.Security.Principal.csproj", "{06ECBECD-4100-474D-8F3C-21A0F66A92A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal", "ref\System.Security.Principal.csproj", "{23171947-F933-47A6-9D1A-D43A186E7C43}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal", "src\System.Security.Principal.csproj", "{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D869B61F-0676-4B1E-B8F0-8F3BAED71FC9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CE867E01-338A-4F8A-A8A2-6E19FD8156C2}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{45602EBE-1508-43A8-A398-1B92BD243557} = {D869B61F-0676-4B1E-B8F0-8F3BAED71FC9}
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51} = {D869B61F-0676-4B1E-B8F0-8F3BAED71FC9}
+		{23171947-F933-47A6-9D1A-D43A186E7C43} = {CE867E01-338A-4F8A-A8A2-6E19FD8156C2}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FBE16BC8-AE2D-422C-861E-861814F53AF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBE16BC8-AE2D-422C-861E-861814F53AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBE16BC8-AE2D-422C-861E-861814F53AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBE16BC8-AE2D-422C-861E-861814F53AF7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06ECBECD-4100-474D-8F3C-21A0F66A92A6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Debug|Any CPU.Build.0 = Debug|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Debug|x64.ActiveCfg = Debug|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Debug|x64.Build.0 = Debug|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Debug|x86.ActiveCfg = Debug|x86
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Debug|x86.Build.0 = Debug|x86
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Release|Any CPU.ActiveCfg = Release|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Release|Any CPU.Build.0 = Release|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Release|x64.ActiveCfg = Release|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Release|x64.Build.0 = Release|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Release|x86.ActiveCfg = Release|x86
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Release|x86.Build.0 = Release|x86
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Checked|Any CPU.Build.0 = Checked|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Checked|x64.ActiveCfg = Checked|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Checked|x64.Build.0 = Checked|x64
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Checked|x86.ActiveCfg = Checked|x86
+		{45602EBE-1508-43A8-A398-1B92BD243557}.Checked|x86.Build.0 = Checked|x86
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Debug|x64.Build.0 = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Debug|x86.Build.0 = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Release|x64.ActiveCfg = Release|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Release|x64.Build.0 = Release|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Release|x86.ActiveCfg = Release|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Release|x86.Build.0 = Release|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{23171947-F933-47A6-9D1A-D43A186E7C43}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Debug|x64.Build.0 = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Debug|x86.Build.0 = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Release|x64.ActiveCfg = Release|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Release|x64.Build.0 = Release|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Release|x86.ActiveCfg = Release|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Release|x86.Build.0 = Release|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BCF529C8-91CA-44BE-A59C-C8FCAEC04D51}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FBE16BC8-AE2D-422C-861E-861814F53AF7} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{06ECBECD-4100-474D-8F3C-21A0F66A92A6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {49140E8F-6265-4A9D-A373-0B83BAB2D6EF}
+		SolutionGuid = {F35EB295-E9B0-4C21-8143-59F3B33A002B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
index 9a13446913bb2e..b13210a0f73455 100644
--- a/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
+++ b/src/libraries/System.Security.SecureString/System.Security.SecureString.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString.Tests", "tests\System.Security.SecureString.Tests.csproj", "{69609238-62C7-479D-A8CE-709F41101D3C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A958BBDD-3238-4E58-AB7F-390AB6D88233} = {A958BBDD-3238-4E58-AB7F-390AB6D88233}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{04D77C80-10A2-4773-A7E5-12D89010CC1A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString", "src\System.Security.SecureString.csproj", "{A958BBDD-3238-4E58-AB7F-390AB6D88233}"
-	ProjectSection(ProjectDependencies) = postProject
-		{899EC05D-7861-447F-9216-67F8547516DD} = {899EC05D-7861-447F-9216-67F8547516DD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{E3698022-02A9-47BA-A0D1-C63BEA5BEBF1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString", "ref\System.Security.SecureString.csproj", "{899EC05D-7861-447F-9216-67F8547516DD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F435EC29-C319-44C5-9595-657136490BB7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E3A870A8-0483-489C-93AC-F624507BCB87}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C4E1FD71-02B3-4032-87B5-14866B06AF91}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString", "ref\System.Security.SecureString.csproj", "{CE7DA336-6577-4960-892A-1313060055BE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString", "src\System.Security.SecureString.csproj", "{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.SecureString.Tests", "tests\System.Security.SecureString.Tests.csproj", "{FB504757-0A3F-49DD-B869-CE20502D23BF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3653DAAA-FB93-463B-9FDA-A12F4CA9084F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{0AC49FD1-CBF3-467D-B62F-C2C8C5B9D803}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D4B9C590-A682-4965-9B66-4231C95136A3}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{04D77C80-10A2-4773-A7E5-12D89010CC1A} = {3653DAAA-FB93-463B-9FDA-A12F4CA9084F}
+		{FB504757-0A3F-49DD-B869-CE20502D23BF} = {3653DAAA-FB93-463B-9FDA-A12F4CA9084F}
+		{E3698022-02A9-47BA-A0D1-C63BEA5BEBF1} = {0AC49FD1-CBF3-467D-B62F-C2C8C5B9D803}
+		{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6} = {0AC49FD1-CBF3-467D-B62F-C2C8C5B9D803}
+		{F435EC29-C319-44C5-9595-657136490BB7} = {0AC49FD1-CBF3-467D-B62F-C2C8C5B9D803}
+		{E3A870A8-0483-489C-93AC-F624507BCB87} = {0AC49FD1-CBF3-467D-B62F-C2C8C5B9D803}
+		{CE7DA336-6577-4960-892A-1313060055BE} = {0AC49FD1-CBF3-467D-B62F-C2C8C5B9D803}
+		{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A} = {D4B9C590-A682-4965-9B66-4231C95136A3}
+		{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C} = {D4B9C590-A682-4965-9B66-4231C95136A3}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{69609238-62C7-479D-A8CE-709F41101D3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{69609238-62C7-479D-A8CE-709F41101D3C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A958BBDD-3238-4E58-AB7F-390AB6D88233}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A958BBDD-3238-4E58-AB7F-390AB6D88233}.Release|Any CPU.Build.0 = Release|Any CPU
-		{899EC05D-7861-447F-9216-67F8547516DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{899EC05D-7861-447F-9216-67F8547516DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{899EC05D-7861-447F-9216-67F8547516DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{899EC05D-7861-447F-9216-67F8547516DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C4E1FD71-02B3-4032-87B5-14866B06AF91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C4E1FD71-02B3-4032-87B5-14866B06AF91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C4E1FD71-02B3-4032-87B5-14866B06AF91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C4E1FD71-02B3-4032-87B5-14866B06AF91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04D77C80-10A2-4773-A7E5-12D89010CC1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3698022-02A9-47BA-A0D1-C63BEA5BEBF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3698022-02A9-47BA-A0D1-C63BEA5BEBF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3698022-02A9-47BA-A0D1-C63BEA5BEBF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3698022-02A9-47BA-A0D1-C63BEA5BEBF1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE9238C8-0999-4E51-B0E0-72D2A7AEFDD6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20B35F7C-A37D-468D-BD60-0DDEB1DBF16A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F435EC29-C319-44C5-9595-657136490BB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F435EC29-C319-44C5-9595-657136490BB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F435EC29-C319-44C5-9595-657136490BB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F435EC29-C319-44C5-9595-657136490BB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3A870A8-0483-489C-93AC-F624507BCB87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3A870A8-0483-489C-93AC-F624507BCB87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3A870A8-0483-489C-93AC-F624507BCB87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3A870A8-0483-489C-93AC-F624507BCB87}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE7DA336-6577-4960-892A-1313060055BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE7DA336-6577-4960-892A-1313060055BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE7DA336-6577-4960-892A-1313060055BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE7DA336-6577-4960-892A-1313060055BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32CFD1C6-A8C4-45C1-BBD8-94D07B33674C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB504757-0A3F-49DD-B869-CE20502D23BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB504757-0A3F-49DD-B869-CE20502D23BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB504757-0A3F-49DD-B869-CE20502D23BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB504757-0A3F-49DD-B869-CE20502D23BF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{69609238-62C7-479D-A8CE-709F41101D3C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A958BBDD-3238-4E58-AB7F-390AB6D88233} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{899EC05D-7861-447F-9216-67F8547516DD} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C4E1FD71-02B3-4032-87B5-14866B06AF91} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A82FA455-C185-437E-AD3C-266E2D79428B}
+		SolutionGuid = {283334F1-CAE4-4ECB-BD56-A8C601391967}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
index a507be59579543..785d078f6f5424 100644
--- a/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
+++ b/src/libraries/System.ServiceModel.Syndication/System.ServiceModel.Syndication.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication.Tests", "tests\System.ServiceModel.Syndication.Tests.csproj", "{A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74} = {C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication", "src\System.ServiceModel.Syndication.csproj", "{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E81F4C7C-2000-4449-BEE6-B2E84DE218F7} = {E81F4C7C-2000-4449-BEE6-B2E84DE218F7}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{1B187FDE-EC95-4258-BE6F-82D33C6485C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication", "ref\System.ServiceModel.Syndication.csproj", "{E81F4C7C-2000-4449-BEE6-B2E84DE218F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{32372D95-0479-478C-9D88-F2E9EFE8799B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{D1D66A3C-C615-443E-8F57-9C0F4443FD0C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{312B3EE4-452D-48C9-9550-37AA9D7FDE1B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{E9C31171-4A6A-4E6C-8FD2-FAB82B668E96}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{77ECB9E0-CA6C-460F-A946-7F9850726BCA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication", "ref\System.ServiceModel.Syndication.csproj", "{2A7BBE91-0165-45E9-8A10-D7346C5179B6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication", "src\System.ServiceModel.Syndication.csproj", "{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Syndication.Tests", "tests\System.ServiceModel.Syndication.Tests.csproj", "{0269CAF5-9979-49A1-AC7B-61139BBBA182}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{476ACC15-CDDC-45C5-B52A-DC04AC4C0159}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{53AEA03A-75B7-4C1B-BFCC-481C7593FC25}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D766E5E6-BB7C-43C0-A94E-6F8B4D053F69}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{66CD0AD6-EBEE-468B-9732-A4C49EF492F4} = {476ACC15-CDDC-45C5-B52A-DC04AC4C0159}
+		{0269CAF5-9979-49A1-AC7B-61139BBBA182} = {476ACC15-CDDC-45C5-B52A-DC04AC4C0159}
+		{1B187FDE-EC95-4258-BE6F-82D33C6485C9} = {53AEA03A-75B7-4C1B-BFCC-481C7593FC25}
+		{32372D95-0479-478C-9D88-F2E9EFE8799B} = {53AEA03A-75B7-4C1B-BFCC-481C7593FC25}
+		{312B3EE4-452D-48C9-9550-37AA9D7FDE1B} = {53AEA03A-75B7-4C1B-BFCC-481C7593FC25}
+		{E9C31171-4A6A-4E6C-8FD2-FAB82B668E96} = {53AEA03A-75B7-4C1B-BFCC-481C7593FC25}
+		{2A7BBE91-0165-45E9-8A10-D7346C5179B6} = {53AEA03A-75B7-4C1B-BFCC-481C7593FC25}
+		{D1D66A3C-C615-443E-8F57-9C0F4443FD0C} = {D766E5E6-BB7C-43C0-A94E-6F8B4D053F69}
+		{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9} = {D766E5E6-BB7C-43C0-A94E-6F8B4D053F69}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A622B2C0-DD74-4218-9CF0-F9B2E52F4E91}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E81F4C7C-2000-4449-BEE6-B2E84DE218F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77ECB9E0-CA6C-460F-A946-7F9850726BCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77ECB9E0-CA6C-460F-A946-7F9850726BCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77ECB9E0-CA6C-460F-A946-7F9850726BCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77ECB9E0-CA6C-460F-A946-7F9850726BCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66CD0AD6-EBEE-468B-9732-A4C49EF492F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B187FDE-EC95-4258-BE6F-82D33C6485C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B187FDE-EC95-4258-BE6F-82D33C6485C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B187FDE-EC95-4258-BE6F-82D33C6485C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B187FDE-EC95-4258-BE6F-82D33C6485C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32372D95-0479-478C-9D88-F2E9EFE8799B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32372D95-0479-478C-9D88-F2E9EFE8799B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32372D95-0479-478C-9D88-F2E9EFE8799B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32372D95-0479-478C-9D88-F2E9EFE8799B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1D66A3C-C615-443E-8F57-9C0F4443FD0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{312B3EE4-452D-48C9-9550-37AA9D7FDE1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{312B3EE4-452D-48C9-9550-37AA9D7FDE1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{312B3EE4-452D-48C9-9550-37AA9D7FDE1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{312B3EE4-452D-48C9-9550-37AA9D7FDE1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9C31171-4A6A-4E6C-8FD2-FAB82B668E96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9C31171-4A6A-4E6C-8FD2-FAB82B668E96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9C31171-4A6A-4E6C-8FD2-FAB82B668E96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9C31171-4A6A-4E6C-8FD2-FAB82B668E96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2A7BBE91-0165-45E9-8A10-D7346C5179B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{02AF5461-4FB0-48B1-AD93-9D5F1022B1E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0269CAF5-9979-49A1-AC7B-61139BBBA182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0269CAF5-9979-49A1-AC7B-61139BBBA182}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0269CAF5-9979-49A1-AC7B-61139BBBA182}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0269CAF5-9979-49A1-AC7B-61139BBBA182}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A622B2C0-DD74-4218-9CF0-F9B2E52F4E91} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{C2AB129B-E3EC-465B-B1B7-0F7D414B1E74} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{E81F4C7C-2000-4449-BEE6-B2E84DE218F7} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{77ECB9E0-CA6C-460F-A946-7F9850726BCA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {319A2B28-47E4-4311-B070-1F9EF259506B}
+		SolutionGuid = {BCEBC86B-FB61-475D-B3A0-6C556A7B5E3B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
index 93e60b8eddeb59..d10e0d08af3fa4 100644
--- a/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
+++ b/src/libraries/System.ServiceProcess.ServiceController/System.ServiceProcess.ServiceController.sln
@@ -1,70 +1,184 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController.TestService", "tests\System.ServiceProcess.ServiceController.TestService\System.ServiceProcess.ServiceController.TestService.csproj", "{E62B874D-1A0D-41BC-8CFC-9E09D0860A77}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05} = {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{5327B05F-E47E-458F-A30E-C5E39441ED1C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController.Tests", "tests\System.ServiceProcess.ServiceController.Tests.csproj", "{F7D9984B-02EB-4573-84EF-00FFFBFB872C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05} = {F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FCEC196B-DFFD-40B8-A492-7A3A1E8CF5B7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "src\System.ServiceProcess.ServiceController.csproj", "{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8479566D-6FA5-4241-9D66-524BEC4C19BD} = {8479566D-6FA5-4241-9D66-524BEC4C19BD}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\src\Microsoft.Win32.Registry.csproj", "{FCEF23E8-C45E-4318-B6A3-91ADB217CCB1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "ref\System.ServiceProcess.ServiceController.csproj", "{8479566D-6FA5-4241-9D66-524BEC4C19BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\ref\System.Diagnostics.EventLog.csproj", "{BC4E45A0-6024-454A-AA4F-8414BEC5FE8B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.EventLog", "..\System.Diagnostics.EventLog\src\System.Diagnostics.EventLog.csproj", "{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\ref\System.IO.FileSystem.AccessControl.csproj", "{09B77CF6-594C-4B7B-AF63-F3C234D7ADCD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A7CF91C5-8445-4DBD-9F63-CC8F91C763AC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.AccessControl", "..\System.IO.FileSystem.AccessControl\src\System.IO.FileSystem.AccessControl.csproj", "{63EA2F1A-671D-4B74-BD8C-99AF41C4E093}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{EB1E236C-9103-4A6E-B892-2184703045AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2F62EEE5-C32A-48A2-9975-5A920F729F38}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{F36CF50B-A86D-4AAB-B481-B731903BCC44}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\ref\System.Security.Permissions.csproj", "{262F64E2-9166-4F98-8221-9E602221DC3A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Permissions", "..\System.Security.Permissions\src\System.Security.Permissions.csproj", "{FB4FB928-C6F3-4BB2-8342-34A0F0296E49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{58FE3677-CF13-4A1C-B437-DAE9F6BCA14D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{77722395-8E28-4EFB-AC4D-73144543D43B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "ref\System.ServiceProcess.ServiceController.csproj", "{E3DD170A-B91F-4615-984A-0A5268B077D0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController", "src\System.ServiceProcess.ServiceController.csproj", "{8B01C9B1-1B3A-47A1-9851-CCD3721237BF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController.Tests", "tests\System.ServiceProcess.ServiceController.Tests.csproj", "{4972291B-4988-418C-9EEC-93AE71C18E4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceProcess.ServiceController.TestService", "tests\System.ServiceProcess.ServiceController.TestService\System.ServiceProcess.ServiceController.TestService.csproj", "{B0E21FE7-22CE-4473-A281-082E0451B597}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "..\System.Threading.AccessControl\src\System.Threading.AccessControl.csproj", "{C49044F2-5980-46DE-B670-573268817E7D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\ref\System.Windows.Extensions.csproj", "{BFC4850D-FA36-42DD-ACEB-AB51BB273D19}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "..\System.Windows.Extensions\src\System.Windows.Extensions.csproj", "{20BCFC25-BFD4-4C0A-93E2-2F24FFCC9DE1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{91CB8365-BA7C-4A39-8FDE-5FC006CAF654}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{67EA9C28-3176-4D68-BE71-BF5D156277A9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4C353BA6-0EAD-4970-8D85-5B1D45016D2A}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{5327B05F-E47E-458F-A30E-C5E39441ED1C} = {91CB8365-BA7C-4A39-8FDE-5FC006CAF654}
+		{4972291B-4988-418C-9EEC-93AE71C18E4F} = {91CB8365-BA7C-4A39-8FDE-5FC006CAF654}
+		{B0E21FE7-22CE-4473-A281-082E0451B597} = {91CB8365-BA7C-4A39-8FDE-5FC006CAF654}
+		{FCEC196B-DFFD-40B8-A492-7A3A1E8CF5B7} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{BC4E45A0-6024-454A-AA4F-8414BEC5FE8B} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{09B77CF6-594C-4B7B-AF63-F3C234D7ADCD} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{EB1E236C-9103-4A6E-B892-2184703045AB} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{2F62EEE5-C32A-48A2-9975-5A920F729F38} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{262F64E2-9166-4F98-8221-9E602221DC3A} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{58FE3677-CF13-4A1C-B437-DAE9F6BCA14D} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{E3DD170A-B91F-4615-984A-0A5268B077D0} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{BFC4850D-FA36-42DD-ACEB-AB51BB273D19} = {67EA9C28-3176-4D68-BE71-BF5D156277A9}
+		{FCEF23E8-C45E-4318-B6A3-91ADB217CCB1} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{63EA2F1A-671D-4B74-BD8C-99AF41C4E093} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{F36CF50B-A86D-4AAB-B481-B731903BCC44} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{FB4FB928-C6F3-4BB2-8342-34A0F0296E49} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{77722395-8E28-4EFB-AC4D-73144543D43B} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{8B01C9B1-1B3A-47A1-9851-CCD3721237BF} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{C49044F2-5980-46DE-B670-573268817E7D} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+		{20BCFC25-BFD4-4C0A-93E2-2F24FFCC9DE1} = {4C353BA6-0EAD-4970-8D85-5B1D45016D2A}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E62B874D-1A0D-41BC-8CFC-9E09D0860A77}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7D9984B-02EB-4573-84EF-00FFFBFB872C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8479566D-6FA5-4241-9D66-524BEC4C19BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8479566D-6FA5-4241-9D66-524BEC4C19BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8479566D-6FA5-4241-9D66-524BEC4C19BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8479566D-6FA5-4241-9D66-524BEC4C19BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7CF91C5-8445-4DBD-9F63-CC8F91C763AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7CF91C5-8445-4DBD-9F63-CC8F91C763AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7CF91C5-8445-4DBD-9F63-CC8F91C763AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7CF91C5-8445-4DBD-9F63-CC8F91C763AC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5327B05F-E47E-458F-A30E-C5E39441ED1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5327B05F-E47E-458F-A30E-C5E39441ED1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5327B05F-E47E-458F-A30E-C5E39441ED1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5327B05F-E47E-458F-A30E-C5E39441ED1C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCEC196B-DFFD-40B8-A492-7A3A1E8CF5B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCEC196B-DFFD-40B8-A492-7A3A1E8CF5B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCEC196B-DFFD-40B8-A492-7A3A1E8CF5B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCEC196B-DFFD-40B8-A492-7A3A1E8CF5B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FCEF23E8-C45E-4318-B6A3-91ADB217CCB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FCEF23E8-C45E-4318-B6A3-91ADB217CCB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FCEF23E8-C45E-4318-B6A3-91ADB217CCB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FCEF23E8-C45E-4318-B6A3-91ADB217CCB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC4E45A0-6024-454A-AA4F-8414BEC5FE8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC4E45A0-6024-454A-AA4F-8414BEC5FE8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC4E45A0-6024-454A-AA4F-8414BEC5FE8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC4E45A0-6024-454A-AA4F-8414BEC5FE8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC3FBFFE-B1BC-4C1B-AC1A-8714767A940E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9E6A5D88-E929-40DB-B2E0-A2A3F83E9117}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09B77CF6-594C-4B7B-AF63-F3C234D7ADCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09B77CF6-594C-4B7B-AF63-F3C234D7ADCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09B77CF6-594C-4B7B-AF63-F3C234D7ADCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09B77CF6-594C-4B7B-AF63-F3C234D7ADCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63EA2F1A-671D-4B74-BD8C-99AF41C4E093}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63EA2F1A-671D-4B74-BD8C-99AF41C4E093}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63EA2F1A-671D-4B74-BD8C-99AF41C4E093}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63EA2F1A-671D-4B74-BD8C-99AF41C4E093}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB1E236C-9103-4A6E-B892-2184703045AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB1E236C-9103-4A6E-B892-2184703045AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB1E236C-9103-4A6E-B892-2184703045AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB1E236C-9103-4A6E-B892-2184703045AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC9E9F1C-CB46-49BF-A1AB-42E0DC2788E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F62EEE5-C32A-48A2-9975-5A920F729F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F62EEE5-C32A-48A2-9975-5A920F729F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F62EEE5-C32A-48A2-9975-5A920F729F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F62EEE5-C32A-48A2-9975-5A920F729F38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F36CF50B-A86D-4AAB-B481-B731903BCC44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F36CF50B-A86D-4AAB-B481-B731903BCC44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F36CF50B-A86D-4AAB-B481-B731903BCC44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F36CF50B-A86D-4AAB-B481-B731903BCC44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{262F64E2-9166-4F98-8221-9E602221DC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{262F64E2-9166-4F98-8221-9E602221DC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{262F64E2-9166-4F98-8221-9E602221DC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{262F64E2-9166-4F98-8221-9E602221DC3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB4FB928-C6F3-4BB2-8342-34A0F0296E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB4FB928-C6F3-4BB2-8342-34A0F0296E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB4FB928-C6F3-4BB2-8342-34A0F0296E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB4FB928-C6F3-4BB2-8342-34A0F0296E49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{58FE3677-CF13-4A1C-B437-DAE9F6BCA14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{58FE3677-CF13-4A1C-B437-DAE9F6BCA14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{58FE3677-CF13-4A1C-B437-DAE9F6BCA14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{58FE3677-CF13-4A1C-B437-DAE9F6BCA14D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{77722395-8E28-4EFB-AC4D-73144543D43B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{77722395-8E28-4EFB-AC4D-73144543D43B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{77722395-8E28-4EFB-AC4D-73144543D43B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{77722395-8E28-4EFB-AC4D-73144543D43B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E3DD170A-B91F-4615-984A-0A5268B077D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E3DD170A-B91F-4615-984A-0A5268B077D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E3DD170A-B91F-4615-984A-0A5268B077D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E3DD170A-B91F-4615-984A-0A5268B077D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B01C9B1-1B3A-47A1-9851-CCD3721237BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B01C9B1-1B3A-47A1-9851-CCD3721237BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B01C9B1-1B3A-47A1-9851-CCD3721237BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B01C9B1-1B3A-47A1-9851-CCD3721237BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4972291B-4988-418C-9EEC-93AE71C18E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4972291B-4988-418C-9EEC-93AE71C18E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4972291B-4988-418C-9EEC-93AE71C18E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4972291B-4988-418C-9EEC-93AE71C18E4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B0E21FE7-22CE-4473-A281-082E0451B597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B0E21FE7-22CE-4473-A281-082E0451B597}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B0E21FE7-22CE-4473-A281-082E0451B597}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B0E21FE7-22CE-4473-A281-082E0451B597}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C49044F2-5980-46DE-B670-573268817E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C49044F2-5980-46DE-B670-573268817E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C49044F2-5980-46DE-B670-573268817E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C49044F2-5980-46DE-B670-573268817E7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFC4850D-FA36-42DD-ACEB-AB51BB273D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFC4850D-FA36-42DD-ACEB-AB51BB273D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFC4850D-FA36-42DD-ACEB-AB51BB273D19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFC4850D-FA36-42DD-ACEB-AB51BB273D19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{20BCFC25-BFD4-4C0A-93E2-2F24FFCC9DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{20BCFC25-BFD4-4C0A-93E2-2F24FFCC9DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{20BCFC25-BFD4-4C0A-93E2-2F24FFCC9DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{20BCFC25-BFD4-4C0A-93E2-2F24FFCC9DE1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E62B874D-1A0D-41BC-8CFC-9E09D0860A77} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F7D9984B-02EB-4573-84EF-00FFFBFB872C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{F4821CB6-91A3-4546-BC4F-E00DBFBDAA05} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{8479566D-6FA5-4241-9D66-524BEC4C19BD} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A7CF91C5-8445-4DBD-9F63-CC8F91C763AC} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {96C35373-65D3-413A-9FF3-2FE941E10CB1}
+		SolutionGuid = {A60086D8-4665-4FB4-ABA7-A74F0CC9983D}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln b/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
index 8e0b74383d3efa..f5217bff8cba38 100644
--- a/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
+++ b/src/libraries/System.Text.Encoding.CodePages/System.Text.Encoding.CodePages.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages.Tests", "tests\System.Text.Encoding.CodePages.Tests.csproj", "{835AD07B-7C9A-406F-B16F-59B3B0D017A4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{16EE6633-F557-5C9E-9EF3-B5334B044F47} = {16EE6633-F557-5C9E-9EF3-B5334B044F47}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E9DABA44-B5F3-4E9B-B9FC-54E558831847}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "src\System.Text.Encoding.CodePages.csproj", "{16EE6633-F557-5C9E-9EF3-B5334B044F47}"
-	ProjectSection(ProjectDependencies) = postProject
-		{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25} = {73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{0DC9BCD0-9A7E-4075-9BAA-9E4FB8D9E36A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "ref\System.Text.Encoding.CodePages.csproj", "{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{49A2E208-6572-4D08-8392-A534EAF93353}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{32840819-87F6-4CAA-A0F6-BB2BD23545FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{B9611992-D940-4DDD-93E7-53BA1D37C0B1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{5A5C75CA-D403-4D8D-A7C6-B75410ABB3C8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{ECDEC479-6AF1-4D15-A0D7-76236109AB28}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "ref\System.Text.Encoding.CodePages.csproj", "{C6B27183-6436-4343-A722-17AAB6A11573}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages", "src\System.Text.Encoding.CodePages.csproj", "{4F894506-769C-4219-BDE7-E1DDE6F1A35D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.CodePages.Tests", "tests\System.Text.Encoding.CodePages.Tests.csproj", "{41C87552-FF98-4814-AD4E-B8E63840C8D5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{718D99D5-1B8C-47A9-88B5-24BBAFCC0FA8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ED079766-8310-423B-BF83-8D3B519FB179}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{000BD81F-E323-4C6E-9431-7E539DBEC402}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E9DABA44-B5F3-4E9B-B9FC-54E558831847} = {718D99D5-1B8C-47A9-88B5-24BBAFCC0FA8}
+		{41C87552-FF98-4814-AD4E-B8E63840C8D5} = {718D99D5-1B8C-47A9-88B5-24BBAFCC0FA8}
+		{0DC9BCD0-9A7E-4075-9BAA-9E4FB8D9E36A} = {ED079766-8310-423B-BF83-8D3B519FB179}
+		{49A2E208-6572-4D08-8392-A534EAF93353} = {ED079766-8310-423B-BF83-8D3B519FB179}
+		{B9611992-D940-4DDD-93E7-53BA1D37C0B1} = {ED079766-8310-423B-BF83-8D3B519FB179}
+		{5A5C75CA-D403-4D8D-A7C6-B75410ABB3C8} = {ED079766-8310-423B-BF83-8D3B519FB179}
+		{C6B27183-6436-4343-A722-17AAB6A11573} = {ED079766-8310-423B-BF83-8D3B519FB179}
+		{32840819-87F6-4CAA-A0F6-BB2BD23545FC} = {000BD81F-E323-4C6E-9431-7E539DBEC402}
+		{4F894506-769C-4219-BDE7-E1DDE6F1A35D} = {000BD81F-E323-4C6E-9431-7E539DBEC402}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{835AD07B-7C9A-406F-B16F-59B3B0D017A4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16EE6633-F557-5C9E-9EF3-B5334B044F47}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ECDEC479-6AF1-4D15-A0D7-76236109AB28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ECDEC479-6AF1-4D15-A0D7-76236109AB28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ECDEC479-6AF1-4D15-A0D7-76236109AB28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ECDEC479-6AF1-4D15-A0D7-76236109AB28}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9DABA44-B5F3-4E9B-B9FC-54E558831847}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DC9BCD0-9A7E-4075-9BAA-9E4FB8D9E36A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DC9BCD0-9A7E-4075-9BAA-9E4FB8D9E36A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DC9BCD0-9A7E-4075-9BAA-9E4FB8D9E36A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DC9BCD0-9A7E-4075-9BAA-9E4FB8D9E36A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49A2E208-6572-4D08-8392-A534EAF93353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49A2E208-6572-4D08-8392-A534EAF93353}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49A2E208-6572-4D08-8392-A534EAF93353}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49A2E208-6572-4D08-8392-A534EAF93353}.Release|Any CPU.Build.0 = Release|Any CPU
+		{32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{32840819-87F6-4CAA-A0F6-BB2BD23545FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9611992-D940-4DDD-93E7-53BA1D37C0B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9611992-D940-4DDD-93E7-53BA1D37C0B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9611992-D940-4DDD-93E7-53BA1D37C0B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9611992-D940-4DDD-93E7-53BA1D37C0B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A5C75CA-D403-4D8D-A7C6-B75410ABB3C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A5C75CA-D403-4D8D-A7C6-B75410ABB3C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A5C75CA-D403-4D8D-A7C6-B75410ABB3C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A5C75CA-D403-4D8D-A7C6-B75410ABB3C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6B27183-6436-4343-A722-17AAB6A11573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6B27183-6436-4343-A722-17AAB6A11573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6B27183-6436-4343-A722-17AAB6A11573}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6B27183-6436-4343-A722-17AAB6A11573}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F894506-769C-4219-BDE7-E1DDE6F1A35D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F894506-769C-4219-BDE7-E1DDE6F1A35D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F894506-769C-4219-BDE7-E1DDE6F1A35D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F894506-769C-4219-BDE7-E1DDE6F1A35D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41C87552-FF98-4814-AD4E-B8E63840C8D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{41C87552-FF98-4814-AD4E-B8E63840C8D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{41C87552-FF98-4814-AD4E-B8E63840C8D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41C87552-FF98-4814-AD4E-B8E63840C8D5}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{835AD07B-7C9A-406F-B16F-59B3B0D017A4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{16EE6633-F557-5C9E-9EF3-B5334B044F47} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{73FAB2B8-589D-4BEA-ADCA-E5CC02296F25} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{ECDEC479-6AF1-4D15-A0D7-76236109AB28} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {1455C417-A39E-4A65-9E0E-9EF0BD045D48}
+		SolutionGuid = {F52AE23D-81D9-4AB4-B6BD-256742DFD31A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
index 13361cf9450778..090f79a06f7001 100644
--- a/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
+++ b/src/libraries/System.Text.Encoding.Extensions/System.Text.Encoding.Extensions.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extensions.Tests", "tests\System.Text.Encoding.Extensions.Tests.csproj", "{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72BFA60D-4F91-4F84-AC6A-910B587DA1BF} = {72BFA60D-4F91-4F84-AC6A-910B587DA1BF}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{E70D3A84-3053-4E44-82FC-A56A574BF6F8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extensions", "src\System.Text.Encoding.Extensions.csproj", "{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{45ED5323-5E2F-445F-B305-21B3044C87B6} = {45ED5323-5E2F-445F-B305-21B3044C87B6}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CC6D3524-D6C8-468B-B908-CE746C1DB175}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extensions", "ref\System.Text.Encoding.Extensions.csproj", "{45ED5323-5E2F-445F-B305-21B3044C87B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3932EF67-E95E-43FC-94FF-299992A9EBF7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{7101801F-0F2D-4D30-BD45-99F0A824EBEC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{84D73D35-3823-4295-B36A-98C93538FD40}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7DC62C65-AD33-4B37-9958-98EE9A4867D4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extensions", "ref\System.Text.Encoding.Extensions.csproj", "{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extensions", "src\System.Text.Encoding.Extensions.csproj", "{EF713897-15F9-42E4-979F-271FA1EF6ECA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Extensions.Tests", "tests\System.Text.Encoding.Extensions.Tests.csproj", "{777B4928-6EE5-42D2-8F95-E43EB027D14E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C5005138-6013-4E68-8E59-D875D523FF29}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F2BC1F6-4943-464F-B1E0-916D0D0909BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{33955FC0-A855-48F2-8AA1-56ADDD99A502}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8} = {C5005138-6013-4E68-8E59-D875D523FF29}
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F} = {C5005138-6013-4E68-8E59-D875D523FF29}
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA} = {C5005138-6013-4E68-8E59-D875D523FF29}
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175} = {3F2BC1F6-4943-464F-B1E0-916D0D0909BB}
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E} = {3F2BC1F6-4943-464F-B1E0-916D0D0909BB}
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7} = {33955FC0-A855-48F2-8AA1-56ADDD99A502}
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC} = {33955FC0-A855-48F2-8AA1-56ADDD99A502}
+		{84D73D35-3823-4295-B36A-98C93538FD40} = {33955FC0-A855-48F2-8AA1-56ADDD99A502}
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2} = {33955FC0-A855-48F2-8AA1-56ADDD99A502}
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C} = {33955FC0-A855-48F2-8AA1-56ADDD99A502}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{72BFA60D-4F91-4F84-AC6A-910B587DA1BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45ED5323-5E2F-445F-B305-21B3044C87B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45ED5323-5E2F-445F-B305-21B3044C87B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DC62C65-AD33-4B37-9958-98EE9A4867D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DC62C65-AD33-4B37-9958-98EE9A4867D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DC62C65-AD33-4B37-9958-98EE9A4867D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DC62C65-AD33-4B37-9958-98EE9A4867D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Debug|Any CPU.Build.0 = Debug|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Debug|x64.ActiveCfg = Debug|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Debug|x64.Build.0 = Debug|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Debug|x86.ActiveCfg = Debug|x86
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Debug|x86.Build.0 = Debug|x86
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Release|Any CPU.ActiveCfg = Release|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Release|Any CPU.Build.0 = Release|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Release|x64.ActiveCfg = Release|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Release|x64.Build.0 = Release|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Release|x86.ActiveCfg = Release|x86
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Release|x86.Build.0 = Release|x86
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Checked|Any CPU.Build.0 = Checked|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Checked|x64.ActiveCfg = Checked|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Checked|x64.Build.0 = Checked|x64
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Checked|x86.ActiveCfg = Checked|x86
+		{E70D3A84-3053-4E44-82FC-A56A574BF6F8}.Checked|x86.Build.0 = Checked|x86
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Debug|x64.Build.0 = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Debug|x86.Build.0 = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Release|x64.ActiveCfg = Release|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Release|x64.Build.0 = Release|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Release|x86.ActiveCfg = Release|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Release|x86.Build.0 = Release|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CC6D3524-D6C8-468B-B908-CE746C1DB175}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Debug|x64.Build.0 = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Debug|x86.Build.0 = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Release|x64.ActiveCfg = Release|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Release|x64.Build.0 = Release|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Release|x86.Build.0 = Release|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3932EF67-E95E-43FC-94FF-299992A9EBF7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x64.Build.0 = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Debug|x86.Build.0 = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x64.ActiveCfg = Release|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x64.Build.0 = Release|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Release|x86.Build.0 = Release|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{7101801F-0F2D-4D30-BD45-99F0A824EBEC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x64.Build.0 = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Debug|x86.Build.0 = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x64.ActiveCfg = Release|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x64.Build.0 = Release|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x86.ActiveCfg = Release|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Release|x86.Build.0 = Release|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E79A9AD6-FA8F-4D25-83CA-A5CB5B96AF6F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Debug|x64.Build.0 = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Debug|x86.Build.0 = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Release|x64.ActiveCfg = Release|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Release|x64.Build.0 = Release|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Release|x86.ActiveCfg = Release|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Release|x86.Build.0 = Release|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{84D73D35-3823-4295-B36A-98C93538FD40}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Debug|x64.Build.0 = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Debug|x86.Build.0 = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Release|x64.ActiveCfg = Release|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Release|x64.Build.0 = Release|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Release|x86.ActiveCfg = Release|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Release|x86.Build.0 = Release|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{82472F5D-B4C0-4CA1-A2BB-62C5DE8F63A2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Debug|x64.Build.0 = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Debug|x86.Build.0 = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Release|x64.ActiveCfg = Release|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Release|x64.Build.0 = Release|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Release|x86.ActiveCfg = Release|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Release|x86.Build.0 = Release|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F66FD767-48C4-4AD2-B5CF-36AB39AEB78C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Release|x64.Build.0 = Release|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Release|x86.Build.0 = Release|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EF713897-15F9-42E4-979F-271FA1EF6ECA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Debug|x64.Build.0 = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Debug|x86.Build.0 = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Release|x64.ActiveCfg = Release|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Release|x64.Build.0 = Release|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Release|x86.ActiveCfg = Release|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Release|x86.Build.0 = Release|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{777B4928-6EE5-42D2-8F95-E43EB027D14E}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{037D5B14-EEE1-43C4-8AA8-9F276C0C10CF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{72BFA60D-4F91-4F84-AC6A-910B587DA1BF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{45ED5323-5E2F-445F-B305-21B3044C87B6} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7DC62C65-AD33-4B37-9958-98EE9A4867D4} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5EC1F05F-F1D8-473F-8913-4A49F1C4ACE5}
+		SolutionGuid = {711E5C3D-F101-4CD2-A3CB-10954791B60C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
index cb147e9b7ce099..38d88185148abf 100644
--- a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
+++ b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Tests", "tests\System.Text.Encoding.Tests.csproj", "{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{635F30B9-5566-4096-B772-68FAA9B00DF4} = {635F30B9-5566-4096-B772-68FAA9B00DF4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{8E868804-E3B3-4933-BFA9-E69F7704B3A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding", "src\System.Text.Encoding.csproj", "{635F30B9-5566-4096-B772-68FAA9B00DF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D5E689FD-4848-4E06-B6ED-35EA09AF9E20} = {D5E689FD-4848-4E06-B6ED-35EA09AF9E20}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{2B15EE47-1C5F-444F-A9CD-EABBE370718E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding", "ref\System.Text.Encoding.csproj", "{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{BC4DD708-26CF-4574-9550-7663DE7B3CB1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E8313B01-55A4-48E6-964A-298512B0FB7B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{6507F04A-DBF6-4D38-94DC-AA95997CEC31}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E58D6917-4B2C-4722-A6B0-9E3C5C1C7BED}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding", "ref\System.Text.Encoding.csproj", "{B4D27B82-8D9C-4699-9E37-06796D9981EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding", "src\System.Text.Encoding.csproj", "{57B651DB-5817-4AB7-BF66-C440109F16F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Tests", "tests\System.Text.Encoding.Tests.csproj", "{EE236E3F-7A5C-4493-A477-560C59B28602}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0FF500A0-3B92-4491-91B5-E6679A2E937F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{762F5474-FF8A-44E6-988E-80F45E5D882D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{ADABEA57-B771-4DB9-ACA5-04B6EB64E1D6}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5} = {0FF500A0-3B92-4491-91B5-E6679A2E937F}
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC} = {0FF500A0-3B92-4491-91B5-E6679A2E937F}
+		{57B651DB-5817-4AB7-BF66-C440109F16F9} = {0FF500A0-3B92-4491-91B5-E6679A2E937F}
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E} = {762F5474-FF8A-44E6-988E-80F45E5D882D}
+		{EE236E3F-7A5C-4493-A477-560C59B28602} = {762F5474-FF8A-44E6-988E-80F45E5D882D}
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1} = {ADABEA57-B771-4DB9-ACA5-04B6EB64E1D6}
+		{E8313B01-55A4-48E6-964A-298512B0FB7B} = {ADABEA57-B771-4DB9-ACA5-04B6EB64E1D6}
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31} = {ADABEA57-B771-4DB9-ACA5-04B6EB64E1D6}
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D} = {ADABEA57-B771-4DB9-ACA5-04B6EB64E1D6}
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB} = {ADABEA57-B771-4DB9-ACA5-04B6EB64E1D6}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{635F30B9-5566-4096-B772-68FAA9B00DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{635F30B9-5566-4096-B772-68FAA9B00DF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5E689FD-4848-4E06-B6ED-35EA09AF9E20}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E58D6917-4B2C-4722-A6B0-9E3C5C1C7BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E58D6917-4B2C-4722-A6B0-9E3C5C1C7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E58D6917-4B2C-4722-A6B0-9E3C5C1C7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E58D6917-4B2C-4722-A6B0-9E3C5C1C7BED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Debug|Any CPU.Build.0 = Debug|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Debug|x64.ActiveCfg = Debug|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Debug|x64.Build.0 = Debug|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Debug|x86.ActiveCfg = Debug|x86
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Debug|x86.Build.0 = Debug|x86
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Release|Any CPU.ActiveCfg = Release|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Release|Any CPU.Build.0 = Release|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Release|x64.ActiveCfg = Release|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Release|x64.Build.0 = Release|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Release|x86.ActiveCfg = Release|x86
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Release|x86.Build.0 = Release|x86
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Checked|Any CPU.Build.0 = Checked|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Checked|x64.ActiveCfg = Checked|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Checked|x64.Build.0 = Checked|x64
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Checked|x86.ActiveCfg = Checked|x86
+		{8E868804-E3B3-4933-BFA9-E69F7704B3A5}.Checked|x86.Build.0 = Checked|x86
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Release|x64.Build.0 = Release|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Release|x86.Build.0 = Release|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2B15EE47-1C5F-444F-A9CD-EABBE370718E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Debug|x64.Build.0 = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Debug|x86.Build.0 = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Release|x64.ActiveCfg = Release|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Release|x64.Build.0 = Release|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Release|x86.ActiveCfg = Release|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Release|x86.Build.0 = Release|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BC4DD708-26CF-4574-9550-7663DE7B3CB1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x64.Build.0 = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Debug|x86.Build.0 = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x64.ActiveCfg = Release|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x64.Build.0 = Release|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x86.ActiveCfg = Release|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Release|x86.Build.0 = Release|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{E8313B01-55A4-48E6-964A-298512B0FB7B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x64.Build.0 = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x64.ActiveCfg = Release|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x64.Build.0 = Release|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Release|x86.Build.0 = Release|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2E6A015C-B78A-4ABB-A623-73956CA3E5FC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Debug|x64.Build.0 = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Debug|x86.Build.0 = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Release|x64.ActiveCfg = Release|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Release|x64.Build.0 = Release|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Release|x86.ActiveCfg = Release|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Release|x86.Build.0 = Release|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6507F04A-DBF6-4D38-94DC-AA95997CEC31}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Debug|x86.Build.0 = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Release|x64.Build.0 = Release|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Release|x86.Build.0 = Release|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D7DEF1A0-4531-4ACC-9175-CEEE4AF6456D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Debug|x64.Build.0 = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Debug|x86.Build.0 = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Release|x64.ActiveCfg = Release|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Release|x64.Build.0 = Release|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Release|x86.ActiveCfg = Release|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Release|x86.Build.0 = Release|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B4D27B82-8D9C-4699-9E37-06796D9981EB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Release|x64.Build.0 = Release|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Release|x86.Build.0 = Release|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{57B651DB-5817-4AB7-BF66-C440109F16F9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Debug|x64.Build.0 = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Debug|x86.Build.0 = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Release|x64.ActiveCfg = Release|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Release|x64.Build.0 = Release|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Release|x86.ActiveCfg = Release|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Release|x86.Build.0 = Release|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EE236E3F-7A5C-4493-A477-560C59B28602}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3BB28F2F-51DF-49A3-A0BF-E1C5C0D7E3E0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{635F30B9-5566-4096-B772-68FAA9B00DF4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{D5E689FD-4848-4E06-B6ED-35EA09AF9E20} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{E58D6917-4B2C-4722-A6B0-9E3C5C1C7BED} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5C54CDF9-8239-4222-985B-19615BD86692}
+		SolutionGuid = {36DCD8A4-C857-4C7F-B7A6-CB6945EA1709}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln b/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
index c3aafa93cfc505..780836340291eb 100644
--- a/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
+++ b/src/libraries/System.Text.Encodings.Web/System.Text.Encodings.Web.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web.Tests", "tests\System.Text.Encodings.Web.Tests.csproj", "{2337A55E-7077-4FBE-8132-2CD8DDC18671}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B7EDBF00-765A-48E8-B593-CD668288E274} = {B7EDBF00-765A-48E8-B593-CD668288E274}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{43450381-504E-4603-BF5D-99CCAC2B8A26}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "src\System.Text.Encodings.Web.csproj", "{B7EDBF00-765A-48E8-B593-CD668288E274}"
-	ProjectSection(ProjectDependencies) = postProject
-		{41648C6D-D431-478D-8228-7EB68714541C} = {41648C6D-D431-478D-8228-7EB68714541C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{4FE2DB31-D63F-4A02-A3A3-9E61FCF73ED4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "ref\System.Text.Encodings.Web.csproj", "{41648C6D-D431-478D-8228-7EB68714541C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{99954F04-4EFB-424F-AD4B-CD5CA5298C60}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DB7B918F-EB7F-456C-ADA5-78D82C5E5027}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{3AA2733B-E1DF-47D2-8666-CC45A94DCAA4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{3B997C73-E1A6-4400-858B-09D41D4B6C14}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{52797F3B-BBF5-4AFC-AB39-B247D606BA76}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "ref\System.Text.Encodings.Web.csproj", "{635D1626-6D21-4DAB-BFEF-F5F13261967B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web", "src\System.Text.Encodings.Web.csproj", "{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encodings.Web.Tests", "tests\System.Text.Encodings.Web.Tests.csproj", "{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1B4DBAA8-AA2E-4FA3-B884-82FBEBD19AFE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D1EF8A04-02C7-4126-B700-EABB089E5780}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{06CA1845-E975-4DFF-9BE0-7888FFB24D7F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{43450381-504E-4603-BF5D-99CCAC2B8A26} = {1B4DBAA8-AA2E-4FA3-B884-82FBEBD19AFE}
+		{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9} = {1B4DBAA8-AA2E-4FA3-B884-82FBEBD19AFE}
+		{4FE2DB31-D63F-4A02-A3A3-9E61FCF73ED4} = {D1EF8A04-02C7-4126-B700-EABB089E5780}
+		{99954F04-4EFB-424F-AD4B-CD5CA5298C60} = {D1EF8A04-02C7-4126-B700-EABB089E5780}
+		{3AA2733B-E1DF-47D2-8666-CC45A94DCAA4} = {D1EF8A04-02C7-4126-B700-EABB089E5780}
+		{3B997C73-E1A6-4400-858B-09D41D4B6C14} = {D1EF8A04-02C7-4126-B700-EABB089E5780}
+		{635D1626-6D21-4DAB-BFEF-F5F13261967B} = {D1EF8A04-02C7-4126-B700-EABB089E5780}
+		{DB7B918F-EB7F-456C-ADA5-78D82C5E5027} = {06CA1845-E975-4DFF-9BE0-7888FFB24D7F}
+		{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18} = {06CA1845-E975-4DFF-9BE0-7888FFB24D7F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2337A55E-7077-4FBE-8132-2CD8DDC18671}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2337A55E-7077-4FBE-8132-2CD8DDC18671}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B7EDBF00-765A-48E8-B593-CD668288E274}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7EDBF00-765A-48E8-B593-CD668288E274}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7EDBF00-765A-48E8-B593-CD668288E274}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7EDBF00-765A-48E8-B593-CD668288E274}.Release|Any CPU.Build.0 = Release|Any CPU
-		{41648C6D-D431-478D-8228-7EB68714541C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{41648C6D-D431-478D-8228-7EB68714541C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{41648C6D-D431-478D-8228-7EB68714541C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{41648C6D-D431-478D-8228-7EB68714541C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{52797F3B-BBF5-4AFC-AB39-B247D606BA76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{52797F3B-BBF5-4AFC-AB39-B247D606BA76}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{52797F3B-BBF5-4AFC-AB39-B247D606BA76}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{52797F3B-BBF5-4AFC-AB39-B247D606BA76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43450381-504E-4603-BF5D-99CCAC2B8A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43450381-504E-4603-BF5D-99CCAC2B8A26}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43450381-504E-4603-BF5D-99CCAC2B8A26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43450381-504E-4603-BF5D-99CCAC2B8A26}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4FE2DB31-D63F-4A02-A3A3-9E61FCF73ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4FE2DB31-D63F-4A02-A3A3-9E61FCF73ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4FE2DB31-D63F-4A02-A3A3-9E61FCF73ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4FE2DB31-D63F-4A02-A3A3-9E61FCF73ED4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99954F04-4EFB-424F-AD4B-CD5CA5298C60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB7B918F-EB7F-456C-ADA5-78D82C5E5027}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3AA2733B-E1DF-47D2-8666-CC45A94DCAA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3AA2733B-E1DF-47D2-8666-CC45A94DCAA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3AA2733B-E1DF-47D2-8666-CC45A94DCAA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3AA2733B-E1DF-47D2-8666-CC45A94DCAA4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B997C73-E1A6-4400-858B-09D41D4B6C14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B997C73-E1A6-4400-858B-09D41D4B6C14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B997C73-E1A6-4400-858B-09D41D4B6C14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B997C73-E1A6-4400-858B-09D41D4B6C14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{635D1626-6D21-4DAB-BFEF-F5F13261967B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{635D1626-6D21-4DAB-BFEF-F5F13261967B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{635D1626-6D21-4DAB-BFEF-F5F13261967B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{635D1626-6D21-4DAB-BFEF-F5F13261967B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A8107A2-1AC1-44D5-A4D4-D8EB52C3CB18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A15B95D2-1DDF-47C9-A92F-03FD5DB720C9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{2337A55E-7077-4FBE-8132-2CD8DDC18671} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{B7EDBF00-765A-48E8-B593-CD668288E274} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{41648C6D-D431-478D-8228-7EB68714541C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{52797F3B-BBF5-4AFC-AB39-B247D606BA76} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2EFFAFC0-87C3-45D1-88AF-35F0AC866D70}
+		SolutionGuid = {E109A20C-D7EF-4175-964A-1AF032DB2A3C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Text.Json/System.Text.Json.sln b/src/libraries/System.Text.Json/System.Text.Json.sln
index ef8cfccfcfb5f2..cf494364f9866e 100644
--- a/src/libraries/System.Text.Json/System.Text.Json.sln
+++ b/src/libraries/System.Text.Json/System.Text.Json.sln
@@ -1,60 +1,128 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.Tests", "tests\System.Text.Json.Tests.csproj", "{5F553243-042C-45C0-8E49-C739131E11C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4} = {79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{102945CA-3736-4B2C-8E68-242A0B247F2B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "src\System.Text.Json.csproj", "{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9F155052-2DDE-4DBD-9F31-ADB45C9FE628} = {9F155052-2DDE-4DBD-9F31-ADB45C9FE628}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\ref\Microsoft.Bcl.AsyncInterfaces.csproj", "{73D5739C-E382-4E22-A7D3-B82705C58C74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "ref\System.Text.Json.csproj", "{9F155052-2DDE-4DBD-9F31-ADB45C9FE628}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bcl.AsyncInterfaces", "..\Microsoft.Bcl.AsyncInterfaces\src\Microsoft.Bcl.AsyncInterfaces.csproj", "{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{25C42754-B384-4842-8FA7-75D7A79ADF0D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Immutable", "..\System.Collections.Immutable\src\System.Collections.Immutable.csproj", "{1C8262DB-7355-40A8-A2EC-4EED7363134A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\ref\System.IO.Pipelines.csproj", "{4774F56D-16A8-4ABB-8C73-5F57609F1773}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C42D5CBB-DAC5-4892-8E69-ED3183A6409E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipelines", "..\System.IO.Pipelines\src\System.IO.Pipelines.csproj", "{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{E2077991-EB83-471C-B17F-72F569FFCE6D}"
+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.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{BE230195-2A1C-4674-BACB-502C2CD864E9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D7276D7D-F117-47C5-B514-8E3E964769BE}"
+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", "ref\System.Text.Json.csproj", "{7015E94D-D20D-48C8-86D7-6A996BE99E0E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json", "src\System.Text.Json.csproj", "{1285FF43-F491-4BE0-B92C-37DA689CBD4B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Json.Tests", "tests\System.Text.Json.Tests.csproj", "{607D1960-1428-40D5-8AC4-D98E3C9BCF47}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3C544454-BD8B-44F4-A174-B61F18957613}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{EC8CE194-261A-4115-9582-E2DB1A25CAFB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{676B6044-FA47-4B7D-AEC2-FA94DB23A423}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{102945CA-3736-4B2C-8E68-242A0B247F2B} = {3C544454-BD8B-44F4-A174-B61F18957613}
+		{607D1960-1428-40D5-8AC4-D98E3C9BCF47} = {3C544454-BD8B-44F4-A174-B61F18957613}
+		{73D5739C-E382-4E22-A7D3-B82705C58C74} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{25C42754-B384-4842-8FA7-75D7A79ADF0D} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{4774F56D-16A8-4ABB-8C73-5F57609F1773} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{E2077991-EB83-471C-B17F-72F569FFCE6D} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{BE230195-2A1C-4674-BACB-502C2CD864E9} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{D7276D7D-F117-47C5-B514-8E3E964769BE} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{7015E94D-D20D-48C8-86D7-6A996BE99E0E} = {EC8CE194-261A-4115-9582-E2DB1A25CAFB}
+		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
+		{1C8262DB-7355-40A8-A2EC-4EED7363134A} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
+		{D05FD93A-BC51-466E-BD56-3F3D6BBE6B06} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
+		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
+		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
+		{1285FF43-F491-4BE0-B92C-37DA689CBD4B} = {676B6044-FA47-4B7D-AEC2-FA94DB23A423}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5F553243-042C-45C0-8E49-C739131E11C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5F553243-042C-45C0-8E49-C739131E11C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5F553243-042C-45C0-8E49-C739131E11C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5F553243-042C-45C0-8E49-C739131E11C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F155052-2DDE-4DBD-9F31-ADB45C9FE628}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C42D5CBB-DAC5-4892-8E69-ED3183A6409E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C42D5CBB-DAC5-4892-8E69-ED3183A6409E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C42D5CBB-DAC5-4892-8E69-ED3183A6409E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C42D5CBB-DAC5-4892-8E69-ED3183A6409E}.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
+		{E9AA0AEB-AEAE-4B28-8D4D-17A6D7C89D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
+		{25C42754-B384-4842-8FA7-75D7A79ADF0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25C42754-B384-4842-8FA7-75D7A79ADF0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25C42754-B384-4842-8FA7-75D7A79ADF0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25C42754-B384-4842-8FA7-75D7A79ADF0D}.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
+		{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
+		{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
+		{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
+		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7909EB27-0D6E-46E6-B9F9-8A1EFD557018}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE230195-2A1C-4674-BACB-502C2CD864E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE230195-2A1C-4674-BACB-502C2CD864E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE230195-2A1C-4674-BACB-502C2CD864E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE230195-2A1C-4674-BACB-502C2CD864E9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7276D7D-F117-47C5-B514-8E3E964769BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7276D7D-F117-47C5-B514-8E3E964769BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7276D7D-F117-47C5-B514-8E3E964769BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7276D7D-F117-47C5-B514-8E3E964769BE}.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
+		{9BCCDA15-8907-4AE3-8871-2F17775DDE4C}.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
+		{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
+		{607D1960-1428-40D5-8AC4-D98E3C9BCF47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{607D1960-1428-40D5-8AC4-D98E3C9BCF47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{607D1960-1428-40D5-8AC4-D98E3C9BCF47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{607D1960-1428-40D5-8AC4-D98E3C9BCF47}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{5F553243-042C-45C0-8E49-C739131E11C3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{79E7EE4E-E8DF-4D67-B103-6930DAAF6EF4} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{9F155052-2DDE-4DBD-9F31-ADB45C9FE628} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C42D5CBB-DAC5-4892-8E69-ED3183A6409E} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F758B7B4-BD9F-4228-A700-5D94D738E7FE}
+		SolutionGuid = {5868B757-D821-41FC-952E-2113A0519506}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
index 8fcd0c47d8dd56..23e8b03dc5c4d1 100644
--- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
+++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Tests", "tests\System.Text.RegularExpressions.Tests.csproj", "{94B106C2-D574-4392-80AB-3EE308A078DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2C58640B-5BED-4E83-9554-CD2B9762643F} = {2C58640B-5BED-4E83-9554-CD2B9762643F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{63551298-BFD4-43FC-8465-AC454228B83C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions", "src\System.Text.RegularExpressions.csproj", "{2C58640B-5BED-4E83-9554-CD2B9762643F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{B262B15E-13E6-4C1E-A25E-16D06E222A09} = {B262B15E-13E6-4C1E-A25E-16D06E222A09}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{EF16970C-5DD9-433C-A842-599F474161FB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions", "ref\System.Text.RegularExpressions.csproj", "{B262B15E-13E6-4C1E-A25E-16D06E222A09}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B7E3B087-583F-49B0-8820-787CD98E54C7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{256180C9-19C8-463B-8738-540F30ACBE7C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{A5B2F698-6A81-4D95-8F97-5CA28905E145}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{64DE5757-B966-42F0-98FA-BFE951A3990C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions", "ref\System.Text.RegularExpressions.csproj", "{C043B00D-8662-43E4-9E87-8BB317059111}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions", "src\System.Text.RegularExpressions.csproj", "{0409C086-D7CC-43F8-9762-C94FB1E47F5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Tests", "tests\System.Text.RegularExpressions.Tests.csproj", "{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D7DEC473-263A-49E2-9FC2-CFF1982CF98A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{92DA0000-35EB-416F-9F41-3163555379F5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5B421D11-CC9B-4D14-B608-BE6F5534B26D}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{63551298-BFD4-43FC-8465-AC454228B83C} = {D7DEC473-263A-49E2-9FC2-CFF1982CF98A}
+		{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC} = {D7DEC473-263A-49E2-9FC2-CFF1982CF98A}
+		{EF16970C-5DD9-433C-A842-599F474161FB} = {92DA0000-35EB-416F-9F41-3163555379F5}
+		{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39} = {92DA0000-35EB-416F-9F41-3163555379F5}
+		{256180C9-19C8-463B-8738-540F30ACBE7C} = {92DA0000-35EB-416F-9F41-3163555379F5}
+		{A5B2F698-6A81-4D95-8F97-5CA28905E145} = {92DA0000-35EB-416F-9F41-3163555379F5}
+		{C043B00D-8662-43E4-9E87-8BB317059111} = {92DA0000-35EB-416F-9F41-3163555379F5}
+		{B7E3B087-583F-49B0-8820-787CD98E54C7} = {5B421D11-CC9B-4D14-B608-BE6F5534B26D}
+		{0409C086-D7CC-43F8-9762-C94FB1E47F5B} = {5B421D11-CC9B-4D14-B608-BE6F5534B26D}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94B106C2-D574-4392-80AB-3EE308A078DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94B106C2-D574-4392-80AB-3EE308A078DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C58640B-5BED-4E83-9554-CD2B9762643F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C58640B-5BED-4E83-9554-CD2B9762643F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B262B15E-13E6-4C1E-A25E-16D06E222A09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B262B15E-13E6-4C1E-A25E-16D06E222A09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B262B15E-13E6-4C1E-A25E-16D06E222A09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B262B15E-13E6-4C1E-A25E-16D06E222A09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64DE5757-B966-42F0-98FA-BFE951A3990C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64DE5757-B966-42F0-98FA-BFE951A3990C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64DE5757-B966-42F0-98FA-BFE951A3990C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64DE5757-B966-42F0-98FA-BFE951A3990C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63551298-BFD4-43FC-8465-AC454228B83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63551298-BFD4-43FC-8465-AC454228B83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63551298-BFD4-43FC-8465-AC454228B83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63551298-BFD4-43FC-8465-AC454228B83C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF16970C-5DD9-433C-A842-599F474161FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF16970C-5DD9-433C-A842-599F474161FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF16970C-5DD9-433C-A842-599F474161FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF16970C-5DD9-433C-A842-599F474161FB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84AABEC1-5CDA-4AB8-819E-9CA508DB6F39}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7E3B087-583F-49B0-8820-787CD98E54C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7E3B087-583F-49B0-8820-787CD98E54C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7E3B087-583F-49B0-8820-787CD98E54C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7E3B087-583F-49B0-8820-787CD98E54C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{256180C9-19C8-463B-8738-540F30ACBE7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{256180C9-19C8-463B-8738-540F30ACBE7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{256180C9-19C8-463B-8738-540F30ACBE7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{256180C9-19C8-463B-8738-540F30ACBE7C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A5B2F698-6A81-4D95-8F97-5CA28905E145}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A5B2F698-6A81-4D95-8F97-5CA28905E145}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A5B2F698-6A81-4D95-8F97-5CA28905E145}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A5B2F698-6A81-4D95-8F97-5CA28905E145}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C043B00D-8662-43E4-9E87-8BB317059111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C043B00D-8662-43E4-9E87-8BB317059111}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C043B00D-8662-43E4-9E87-8BB317059111}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C043B00D-8662-43E4-9E87-8BB317059111}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0409C086-D7CC-43F8-9762-C94FB1E47F5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0409C086-D7CC-43F8-9762-C94FB1E47F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0409C086-D7CC-43F8-9762-C94FB1E47F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0409C086-D7CC-43F8-9762-C94FB1E47F5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EE1A7C4-3630-4900-8976-9B3ADAFF10DC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{94B106C2-D574-4392-80AB-3EE308A078DF} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2C58640B-5BED-4E83-9554-CD2B9762643F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B262B15E-13E6-4C1E-A25E-16D06E222A09} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{64DE5757-B966-42F0-98FA-BFE951A3990C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CB23A868-50B7-44AF-9365-275595F5B312}
+		SolutionGuid = {1ED4AB32-B7AA-478F-A96B-F725ACD0AABB}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
index 6446cd0f8f37d3..d7e6b9b7e56690 100644
--- a/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
+++ b/src/libraries/System.Threading.AccessControl/System.Threading.AccessControl.sln
@@ -1,60 +1,100 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29411.138
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl.Tests", "tests\System.Threading.AccessControl.Tests.csproj", "{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA} = {E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "src\System.Threading.AccessControl.csproj", "{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C2B1A23B-16F9-4015-BE3C-DD871A7C108D} = {C2B1A23B-16F9-4015-BE3C-DD871A7C108D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{9613F9F9-E825-4BCE-B42E-266607988415}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "ref\System.Threading.AccessControl.csproj", "{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{637C634B-A63F-42BD-A223-E257D4389F34}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{AA17B6B4-6C0C-44C6-8A37-A5483E042CE6}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\src\System.Security.AccessControl.csproj", "{75830AE4-D3E7-4C24-BEF0-18743F8F9A90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{1EB17975-F0EF-4F67-AECC-5346D6B10C97}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{30EDDB0F-70B3-4B8D-A887-183E96E75177}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj", "{E51CBAA3-8814-4BFC-84F7-8B81F06845F9}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "ref\System.Threading.AccessControl.csproj", "{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl", "src\System.Threading.AccessControl.csproj", "{6A444824-8479-4DB5-8DCA-9F50353ADE29}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.AccessControl.Tests", "tests\System.Threading.AccessControl.Tests.csproj", "{66D93328-0A8C-44AD-923B-AD3EB69A9518}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B845A5B7-6B1B-4922-B60B-4438A1B65D04}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{FD027D60-2F4C-4713-9DDA-F8EE1A960874}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{27CA9827-EB5A-40D6-ABC5-82412705C48A}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097} = {B845A5B7-6B1B-4922-B60B-4438A1B65D04}
+		{66D93328-0A8C-44AD-923B-AD3EB69A9518} = {B845A5B7-6B1B-4922-B60B-4438A1B65D04}
+		{9613F9F9-E825-4BCE-B42E-266607988415} = {FD027D60-2F4C-4713-9DDA-F8EE1A960874}
+		{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B} = {FD027D60-2F4C-4713-9DDA-F8EE1A960874}
+		{AA17B6B4-6C0C-44C6-8A37-A5483E042CE6} = {FD027D60-2F4C-4713-9DDA-F8EE1A960874}
+		{30EDDB0F-70B3-4B8D-A887-183E96E75177} = {FD027D60-2F4C-4713-9DDA-F8EE1A960874}
+		{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D} = {FD027D60-2F4C-4713-9DDA-F8EE1A960874}
+		{637C634B-A63F-42BD-A223-E257D4389F34} = {27CA9827-EB5A-40D6-ABC5-82412705C48A}
+		{75830AE4-D3E7-4C24-BEF0-18743F8F9A90} = {27CA9827-EB5A-40D6-ABC5-82412705C48A}
+		{E51CBAA3-8814-4BFC-84F7-8B81F06845F9} = {27CA9827-EB5A-40D6-ABC5-82412705C48A}
+		{6A444824-8479-4DB5-8DCA-9F50353ADE29} = {27CA9827-EB5A-40D6-ABC5-82412705C48A}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C2B1A23B-16F9-4015-BE3C-DD871A7C108D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EB17975-F0EF-4F67-AECC-5346D6B10C97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EB17975-F0EF-4F67-AECC-5346D6B10C97}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EB17975-F0EF-4F67-AECC-5346D6B10C97}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1EB17975-F0EF-4F67-AECC-5346D6B10C97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7A3FDF55-70D1-42F5-9231-8F7CAB1B7097}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9613F9F9-E825-4BCE-B42E-266607988415}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9613F9F9-E825-4BCE-B42E-266607988415}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9613F9F9-E825-4BCE-B42E-266607988415}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9613F9F9-E825-4BCE-B42E-266607988415}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7C8C6AA-EC54-4662-B6D4-8607F3343C0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{637C634B-A63F-42BD-A223-E257D4389F34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{637C634B-A63F-42BD-A223-E257D4389F34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{637C634B-A63F-42BD-A223-E257D4389F34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{637C634B-A63F-42BD-A223-E257D4389F34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA17B6B4-6C0C-44C6-8A37-A5483E042CE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA17B6B4-6C0C-44C6-8A37-A5483E042CE6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA17B6B4-6C0C-44C6-8A37-A5483E042CE6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA17B6B4-6C0C-44C6-8A37-A5483E042CE6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{75830AE4-D3E7-4C24-BEF0-18743F8F9A90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{75830AE4-D3E7-4C24-BEF0-18743F8F9A90}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{75830AE4-D3E7-4C24-BEF0-18743F8F9A90}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{75830AE4-D3E7-4C24-BEF0-18743F8F9A90}.Release|Any CPU.Build.0 = Release|Any CPU
+		{30EDDB0F-70B3-4B8D-A887-183E96E75177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{30EDDB0F-70B3-4B8D-A887-183E96E75177}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{30EDDB0F-70B3-4B8D-A887-183E96E75177}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{30EDDB0F-70B3-4B8D-A887-183E96E75177}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E51CBAA3-8814-4BFC-84F7-8B81F06845F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E51CBAA3-8814-4BFC-84F7-8B81F06845F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E51CBAA3-8814-4BFC-84F7-8B81F06845F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E51CBAA3-8814-4BFC-84F7-8B81F06845F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EA32BE1-8B5E-4807-B641-E7556C1E2C9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A444824-8479-4DB5-8DCA-9F50353ADE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A444824-8479-4DB5-8DCA-9F50353ADE29}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A444824-8479-4DB5-8DCA-9F50353ADE29}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A444824-8479-4DB5-8DCA-9F50353ADE29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66D93328-0A8C-44AD-923B-AD3EB69A9518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66D93328-0A8C-44AD-923B-AD3EB69A9518}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66D93328-0A8C-44AD-923B-AD3EB69A9518}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66D93328-0A8C-44AD-923B-AD3EB69A9518}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{458E445C-DF3C-4E4D-8E1D-F2FAC365BB40} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{C2B1A23B-16F9-4015-BE3C-DD871A7C108D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{1EB17975-F0EF-4F67-AECC-5346D6B10C97} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F00AF68E-7DF4-4701-AAF8-9D4BC4A24E39}
+		SolutionGuid = {6F3B4C7D-242F-4FAD-AB68-E3CE4552686F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
index cabfd6be410201..e3798ffc88d5b9 100644
--- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
+++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.Tests", "tests\System.Threading.Channels.Tests.csproj", "{1AF01469-DBFC-4BA1-9331-8E39AA639FEE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {AAADA5D3-CF64-4E9D-943C-EFDC006D6366}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C1F10802-5F76-472B-B164-C1D181DB5EBC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "src\System.Threading.Channels.csproj", "{AAADA5D3-CF64-4E9D-943C-EFDC006D6366}"
-	ProjectSection(ProjectDependencies) = postProject
-		{97DB4782-7AB3-4F4C-B716-CF722A0E6066} = {97DB4782-7AB3-4F4C-B716-CF722A0E6066}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B28A96DA-7D6C-4BAD-97CB-E716ADBE6B74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "ref\System.Threading.Channels.csproj", "{97DB4782-7AB3-4F4C-B716-CF722A0E6066}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{4569516A-531A-4F61-B887-0429B913CC2D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F3F3AE54-069A-4BD3-AD47-F14BBB38D204}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{7F1E9499-6C70-4FEC-B183-CB64D0BB9F2F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{111496AA-454B-43F7-B934-1FCB059FF1B0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "ref\System.Threading.Channels.csproj", "{E427C88B-655E-43F9-A0C0-AA54D01BDBDF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels", "src\System.Threading.Channels.csproj", "{4CFA1610-00D7-4651-82C8-A7504C475837}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.Tests", "tests\System.Threading.Channels.Tests.csproj", "{845BFFC3-14F2-402E-81E5-B487D41B7CD9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{42020AA6-49BE-4087-945A-D9219F109DC5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{79BE1935-330E-4402-B2FC-A0C211B02799}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{603FDD5C-ECD4-4EA5-9479-1BDC63A018CC}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{C1F10802-5F76-472B-B164-C1D181DB5EBC} = {42020AA6-49BE-4087-945A-D9219F109DC5}
+		{845BFFC3-14F2-402E-81E5-B487D41B7CD9} = {42020AA6-49BE-4087-945A-D9219F109DC5}
+		{B28A96DA-7D6C-4BAD-97CB-E716ADBE6B74} = {79BE1935-330E-4402-B2FC-A0C211B02799}
+		{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD} = {79BE1935-330E-4402-B2FC-A0C211B02799}
+		{F3F3AE54-069A-4BD3-AD47-F14BBB38D204} = {79BE1935-330E-4402-B2FC-A0C211B02799}
+		{7F1E9499-6C70-4FEC-B183-CB64D0BB9F2F} = {79BE1935-330E-4402-B2FC-A0C211B02799}
+		{E427C88B-655E-43F9-A0C0-AA54D01BDBDF} = {79BE1935-330E-4402-B2FC-A0C211B02799}
+		{4569516A-531A-4F61-B887-0429B913CC2D} = {603FDD5C-ECD4-4EA5-9479-1BDC63A018CC}
+		{4CFA1610-00D7-4651-82C8-A7504C475837} = {603FDD5C-ECD4-4EA5-9479-1BDC63A018CC}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AF01469-DBFC-4BA1-9331-8E39AA639FEE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAADA5D3-CF64-4E9D-943C-EFDC006D6366}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97DB4782-7AB3-4F4C-B716-CF722A0E6066}.Release|Any CPU.Build.0 = Release|Any CPU
-		{111496AA-454B-43F7-B934-1FCB059FF1B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{111496AA-454B-43F7-B934-1FCB059FF1B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{111496AA-454B-43F7-B934-1FCB059FF1B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{111496AA-454B-43F7-B934-1FCB059FF1B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1F10802-5F76-472B-B164-C1D181DB5EBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B28A96DA-7D6C-4BAD-97CB-E716ADBE6B74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B28A96DA-7D6C-4BAD-97CB-E716ADBE6B74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B28A96DA-7D6C-4BAD-97CB-E716ADBE6B74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B28A96DA-7D6C-4BAD-97CB-E716ADBE6B74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D29F8C8C-DC1D-46CD-B584-372AEF5BAECD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4569516A-531A-4F61-B887-0429B913CC2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4569516A-531A-4F61-B887-0429B913CC2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4569516A-531A-4F61-B887-0429B913CC2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4569516A-531A-4F61-B887-0429B913CC2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3F3AE54-069A-4BD3-AD47-F14BBB38D204}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3F3AE54-069A-4BD3-AD47-F14BBB38D204}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3F3AE54-069A-4BD3-AD47-F14BBB38D204}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F3F3AE54-069A-4BD3-AD47-F14BBB38D204}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F1E9499-6C70-4FEC-B183-CB64D0BB9F2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F1E9499-6C70-4FEC-B183-CB64D0BB9F2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F1E9499-6C70-4FEC-B183-CB64D0BB9F2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F1E9499-6C70-4FEC-B183-CB64D0BB9F2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E427C88B-655E-43F9-A0C0-AA54D01BDBDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CFA1610-00D7-4651-82C8-A7504C475837}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CFA1610-00D7-4651-82C8-A7504C475837}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CFA1610-00D7-4651-82C8-A7504C475837}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CFA1610-00D7-4651-82C8-A7504C475837}.Release|Any CPU.Build.0 = Release|Any CPU
+		{845BFFC3-14F2-402E-81E5-B487D41B7CD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{845BFFC3-14F2-402E-81E5-B487D41B7CD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{845BFFC3-14F2-402E-81E5-B487D41B7CD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{845BFFC3-14F2-402E-81E5-B487D41B7CD9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1AF01469-DBFC-4BA1-9331-8E39AA639FEE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{97DB4782-7AB3-4F4C-B716-CF722A0E6066} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{111496AA-454B-43F7-B934-1FCB059FF1B0} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7FDF2E27-3C60-44C9-A900-2CDCD09D5F90}
+		SolutionGuid = {32969D61-FEC0-4702-A3D4-88EC58F8ED5A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
index 0c79d7adf36a9c..d92438f1e465ed 100644
--- a/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
+++ b/src/libraries/System.Threading.Overlapped/System.Threading.Overlapped.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped.Tests", "tests\System.Threading.Overlapped.Tests.csproj", "{861A3318-35AD-46ac-8257-8D5D2479BAD9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5} = {6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{2F704A4A-944B-487C-BB11-D66CA63F3B05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped", "src\System.Threading.Overlapped.csproj", "{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F71467DF-30C1-44A0-A15A-163CB5DB4E6E} = {F71467DF-30C1-44A0-A15A-163CB5DB4E6E}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped", "ref\System.Threading.Overlapped.csproj", "{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{27FD8FBD-BAB7-4F52-9451-81362215B2D7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{217A3A01-70DC-4A0D-87C0-04D581B49183}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{78508676-C2A9-43EB-B45F-B83CAAF7923E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{C01FD9F2-31CD-426F-84B3-C824BB2EFF83}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped", "ref\System.Threading.Overlapped.csproj", "{05F39036-EF46-438F-8033-084B5C14832B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped", "src\System.Threading.Overlapped.csproj", "{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Overlapped.Tests", "tests\System.Threading.Overlapped.Tests.csproj", "{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8EE01650-7F83-48CC-90FA-236AB12940FD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{49D3E92E-9015-4685-A968-EF3E7D3F2C6D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DBB7D444-C789-4C3A-894D-A90B5522A15E}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05} = {8EE01650-7F83-48CC-90FA-236AB12940FD}
+		{217A3A01-70DC-4A0D-87C0-04D581B49183} = {8EE01650-7F83-48CC-90FA-236AB12940FD}
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF} = {8EE01650-7F83-48CC-90FA-236AB12940FD}
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F} = {49D3E92E-9015-4685-A968-EF3E7D3F2C6D}
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1} = {49D3E92E-9015-4685-A968-EF3E7D3F2C6D}
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7} = {DBB7D444-C789-4C3A-894D-A90B5522A15E}
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E} = {DBB7D444-C789-4C3A-894D-A90B5522A15E}
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E} = {DBB7D444-C789-4C3A-894D-A90B5522A15E}
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E} = {DBB7D444-C789-4C3A-894D-A90B5522A15E}
+		{05F39036-EF46-438F-8033-084B5C14832B} = {DBB7D444-C789-4C3A-894D-A90B5522A15E}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{861A3318-35AD-46ac-8257-8D5D2479BAD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{861A3318-35AD-46ac-8257-8D5D2479BAD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{861A3318-35AD-46ac-8257-8D5D2479BAD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{861A3318-35AD-46ac-8257-8D5D2479BAD9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F71467DF-30C1-44A0-A15A-163CB5DB4E6E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C01FD9F2-31CD-426F-84B3-C824BB2EFF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C01FD9F2-31CD-426F-84B3-C824BB2EFF83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C01FD9F2-31CD-426F-84B3-C824BB2EFF83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C01FD9F2-31CD-426F-84B3-C824BB2EFF83}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Debug|Any CPU.Build.0 = Debug|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Debug|x64.ActiveCfg = Debug|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Debug|x64.Build.0 = Debug|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Debug|x86.ActiveCfg = Debug|x86
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Debug|x86.Build.0 = Debug|x86
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Release|Any CPU.ActiveCfg = Release|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Release|Any CPU.Build.0 = Release|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Release|x64.ActiveCfg = Release|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Release|x64.Build.0 = Release|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Release|x86.ActiveCfg = Release|x86
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Release|x86.Build.0 = Release|x86
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Checked|Any CPU.Build.0 = Checked|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Checked|x64.ActiveCfg = Checked|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Checked|x64.Build.0 = Checked|x64
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Checked|x86.ActiveCfg = Checked|x86
+		{2F704A4A-944B-487C-BB11-D66CA63F3B05}.Checked|x86.Build.0 = Checked|x86
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Debug|x64.Build.0 = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Debug|x86.Build.0 = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Release|x64.ActiveCfg = Release|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Release|x64.Build.0 = Release|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Release|x86.ActiveCfg = Release|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Release|x86.Build.0 = Release|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A4B84F3E-9C18-4CF7-8CA8-9F4AA4A1634F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Release|x64.Build.0 = Release|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Release|x86.Build.0 = Release|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{27FD8FBD-BAB7-4F52-9451-81362215B2D7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x64.Build.0 = Release|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Release|x86.Build.0 = Release|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CE4C0C71-A94E-42B0-B6EA-46710F09B04E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x64.Build.0 = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Debug|x86.Build.0 = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|Any CPU.Build.0 = Release|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x64.ActiveCfg = Release|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x64.Build.0 = Release|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x86.ActiveCfg = Release|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Release|x86.Build.0 = Release|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{217A3A01-70DC-4A0D-87C0-04D581B49183}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Debug|x64.Build.0 = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Debug|x86.Build.0 = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Release|x64.ActiveCfg = Release|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Release|x64.Build.0 = Release|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Release|x86.ActiveCfg = Release|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Release|x86.Build.0 = Release|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{78508676-C2A9-43EB-B45F-B83CAAF7923E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Debug|x64.Build.0 = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Debug|x86.Build.0 = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Release|x64.ActiveCfg = Release|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Release|x64.Build.0 = Release|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Release|x86.ActiveCfg = Release|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Release|x86.Build.0 = Release|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FA46B19D-A914-426A-9ACB-ADD1ACCE696E}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Debug|x64.Build.0 = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Debug|x86.Build.0 = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Release|x64.ActiveCfg = Release|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Release|x64.Build.0 = Release|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Release|x86.ActiveCfg = Release|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Release|x86.Build.0 = Release|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{05F39036-EF46-438F-8033-084B5C14832B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Release|x64.Build.0 = Release|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Release|x86.Build.0 = Release|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A3D9C10B-53A3-483C-8D90-BE7C078B82DF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Release|x64.Build.0 = Release|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Release|x86.Build.0 = Release|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3F9C730B-665F-49A3-AB6D-C0A08E4F7CD1}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{861A3318-35AD-46ac-8257-8D5D2479BAD9} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{6A07CCB8-3E59-47e7-B3DD-DB1F6FC501D5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F71467DF-30C1-44A0-A15A-163CB5DB4E6E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C01FD9F2-31CD-426F-84B3-C824BB2EFF83} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C2895025-ABF3-4388-8869-3EE0FE0E02B6}
+		SolutionGuid = {E07B568D-46A8-4A3F-86A3-2710CA761847}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln b/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
index 1c13fec9dbbc47..3e8e1c5ee946cd 100644
--- a/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
+++ b/src/libraries/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow.Tests", "tests\System.Threading.Tasks.Dataflow.Tests.csproj", "{A7AA2FC3-855F-44BA-8735-AB2F43D118A5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2E2F7224-7C72-4A81-9625-A5241F8D836D} = {2E2F7224-7C72-4A81-9625-A5241F8D836D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{48428161-C841-43D4-8BD3-195A3D5C36C5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow", "src\System.Threading.Tasks.Dataflow.csproj", "{2E2F7224-7C72-4A81-9625-A5241F8D836D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1} = {01F36E3F-7664-4A71-AE6E-B8B6BF724FD1}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{8087F546-B189-41BE-B7E9-E0CCA0153F45}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow", "ref\System.Threading.Tasks.Dataflow.csproj", "{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{620A0DEE-9FA3-4DA2-A174-473249A71978}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8E3BE52B-6E46-4D22-816B-F1D53D9C14DC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{EB130778-3D8E-4AD1-9C8F-AD90C943B3FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{A47AB134-A463-4307-8DEE-922D79AECD3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow", "ref\System.Threading.Tasks.Dataflow.csproj", "{BD042162-B4E2-45AC-8225-699F25478852}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow", "src\System.Threading.Tasks.Dataflow.csproj", "{EA4AFF05-8124-4D15-A7A3-C731C21728BB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Dataflow.Tests", "tests\System.Threading.Tasks.Dataflow.Tests.csproj", "{51B191E6-C503-4949-8AD0-CF338FE13ADB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{92D9B839-3CB8-4DB6-93A5-7B03F6BA0418}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A522BAAC-89E9-4649-BE11-BD0943082079}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6BC6F7B0-FF26-4952-BBFA-0545F5C446DB}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{48428161-C841-43D4-8BD3-195A3D5C36C5} = {92D9B839-3CB8-4DB6-93A5-7B03F6BA0418}
+		{51B191E6-C503-4949-8AD0-CF338FE13ADB} = {92D9B839-3CB8-4DB6-93A5-7B03F6BA0418}
+		{8087F546-B189-41BE-B7E9-E0CCA0153F45} = {A522BAAC-89E9-4649-BE11-BD0943082079}
+		{620A0DEE-9FA3-4DA2-A174-473249A71978} = {A522BAAC-89E9-4649-BE11-BD0943082079}
+		{8E3BE52B-6E46-4D22-816B-F1D53D9C14DC} = {A522BAAC-89E9-4649-BE11-BD0943082079}
+		{EB130778-3D8E-4AD1-9C8F-AD90C943B3FC} = {A522BAAC-89E9-4649-BE11-BD0943082079}
+		{BD042162-B4E2-45AC-8225-699F25478852} = {A522BAAC-89E9-4649-BE11-BD0943082079}
+		{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A} = {6BC6F7B0-FF26-4952-BBFA-0545F5C446DB}
+		{EA4AFF05-8124-4D15-A7A3-C731C21728BB} = {6BC6F7B0-FF26-4952-BBFA-0545F5C446DB}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7AA2FC3-855F-44BA-8735-AB2F43D118A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E2F7224-7C72-4A81-9625-A5241F8D836D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2E2F7224-7C72-4A81-9625-A5241F8D836D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E2F7224-7C72-4A81-9625-A5241F8D836D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2E2F7224-7C72-4A81-9625-A5241F8D836D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A47AB134-A463-4307-8DEE-922D79AECD3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A47AB134-A463-4307-8DEE-922D79AECD3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A47AB134-A463-4307-8DEE-922D79AECD3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A47AB134-A463-4307-8DEE-922D79AECD3A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{48428161-C841-43D4-8BD3-195A3D5C36C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48428161-C841-43D4-8BD3-195A3D5C36C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48428161-C841-43D4-8BD3-195A3D5C36C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48428161-C841-43D4-8BD3-195A3D5C36C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8087F546-B189-41BE-B7E9-E0CCA0153F45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8087F546-B189-41BE-B7E9-E0CCA0153F45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8087F546-B189-41BE-B7E9-E0CCA0153F45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8087F546-B189-41BE-B7E9-E0CCA0153F45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{620A0DEE-9FA3-4DA2-A174-473249A71978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{620A0DEE-9FA3-4DA2-A174-473249A71978}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{620A0DEE-9FA3-4DA2-A174-473249A71978}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{620A0DEE-9FA3-4DA2-A174-473249A71978}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10CE6AF8-EB7B-4735-BCA8-531EEC47D33A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E3BE52B-6E46-4D22-816B-F1D53D9C14DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E3BE52B-6E46-4D22-816B-F1D53D9C14DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E3BE52B-6E46-4D22-816B-F1D53D9C14DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E3BE52B-6E46-4D22-816B-F1D53D9C14DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EB130778-3D8E-4AD1-9C8F-AD90C943B3FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EB130778-3D8E-4AD1-9C8F-AD90C943B3FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EB130778-3D8E-4AD1-9C8F-AD90C943B3FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EB130778-3D8E-4AD1-9C8F-AD90C943B3FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD042162-B4E2-45AC-8225-699F25478852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD042162-B4E2-45AC-8225-699F25478852}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD042162-B4E2-45AC-8225-699F25478852}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD042162-B4E2-45AC-8225-699F25478852}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA4AFF05-8124-4D15-A7A3-C731C21728BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA4AFF05-8124-4D15-A7A3-C731C21728BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA4AFF05-8124-4D15-A7A3-C731C21728BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA4AFF05-8124-4D15-A7A3-C731C21728BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51B191E6-C503-4949-8AD0-CF338FE13ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51B191E6-C503-4949-8AD0-CF338FE13ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51B191E6-C503-4949-8AD0-CF338FE13ADB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51B191E6-C503-4949-8AD0-CF338FE13ADB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{A7AA2FC3-855F-44BA-8735-AB2F43D118A5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{2E2F7224-7C72-4A81-9625-A5241F8D836D} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{01F36E3F-7664-4A71-AE6E-B8B6BF724FD1} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A47AB134-A463-4307-8DEE-922D79AECD3A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9D0B45A3-B443-4B62-8701-777891509E0D}
+		SolutionGuid = {0C9180F6-E88A-4F7E-801E-455E97B34F83}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
index 1df2c9dfba1590..2606005c035906 100644
--- a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
+++ b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions.Tests", "tests\System.Threading.Tasks.Extensions.Tests.csproj", "{275B161B-D525-48A0-B1DE-344273AB9A99}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DE90AD0B-649D-4062-B8D9-9658DE140532} = {DE90AD0B-649D-4062-B8D9-9658DE140532}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions", "src\System.Threading.Tasks.Extensions.csproj", "{DE90AD0B-649D-4062-B8D9-9658DE140532}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} = {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions", "ref\System.Threading.Tasks.Extensions.csproj", "{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0C981E9F-9018-4614-952D-EBFA1A1E4111}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{6798BD46-9242-4F00-A3DB-9D11E5E487E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions", "ref\System.Threading.Tasks.Extensions.csproj", "{8E73F6BD-A0A2-4C98-B4E3-42391B135943}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions", "src\System.Threading.Tasks.Extensions.csproj", "{F67BB87D-2927-4BD4-B21B-5A403B6A2209}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions.Tests", "tests\System.Threading.Tasks.Extensions.Tests.csproj", "{AE779AC7-EC2C-42BE-8E59-A2716799E098}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C9453AD5-4AD3-4200-85D7-DF411668E23E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{00883D6E-50F7-414B-B1CD-2749AE3FC500}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{4038421F-F7C5-4698-85E5-9D6C51581F4F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0} = {C9453AD5-4AD3-4200-85D7-DF411668E23E}
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A} = {C9453AD5-4AD3-4200-85D7-DF411668E23E}
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209} = {C9453AD5-4AD3-4200-85D7-DF411668E23E}
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9} = {00883D6E-50F7-414B-B1CD-2749AE3FC500}
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098} = {00883D6E-50F7-414B-B1CD-2749AE3FC500}
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9} = {4038421F-F7C5-4698-85E5-9D6C51581F4F}
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA} = {4038421F-F7C5-4698-85E5-9D6C51581F4F}
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A} = {4038421F-F7C5-4698-85E5-9D6C51581F4F}
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7} = {4038421F-F7C5-4698-85E5-9D6C51581F4F}
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943} = {4038421F-F7C5-4698-85E5-9D6C51581F4F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{275B161B-D525-48A0-B1DE-344273AB9A99}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{275B161B-D525-48A0-B1DE-344273AB9A99}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE90AD0B-649D-4062-B8D9-9658DE140532}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE90AD0B-649D-4062-B8D9-9658DE140532}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0C981E9F-9018-4614-952D-EBFA1A1E4111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C981E9F-9018-4614-952D-EBFA1A1E4111}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C981E9F-9018-4614-952D-EBFA1A1E4111}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C981E9F-9018-4614-952D-EBFA1A1E4111}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Debug|Any CPU.Build.0 = Debug|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Debug|x64.ActiveCfg = Debug|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Debug|x64.Build.0 = Debug|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Debug|x86.ActiveCfg = Debug|x86
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Debug|x86.Build.0 = Debug|x86
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Release|Any CPU.ActiveCfg = Release|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Release|Any CPU.Build.0 = Release|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Release|x64.ActiveCfg = Release|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Release|x64.Build.0 = Release|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Release|x86.ActiveCfg = Release|x86
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Release|x86.Build.0 = Release|x86
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Checked|Any CPU.Build.0 = Checked|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Checked|x64.ActiveCfg = Checked|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Checked|x64.Build.0 = Checked|x64
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Checked|x86.ActiveCfg = Checked|x86
+		{CB976362-9258-4E98-B8C3-FAE11BDF3AA0}.Checked|x86.Build.0 = Checked|x86
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Debug|x64.Build.0 = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Debug|x86.Build.0 = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Release|x64.ActiveCfg = Release|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Release|x64.Build.0 = Release|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Release|x86.ActiveCfg = Release|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Release|x86.Build.0 = Release|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FFB40D04-17A5-4F9B-BD47-994E5616ABD9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Debug|x64.Build.0 = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Debug|x86.Build.0 = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Release|x64.ActiveCfg = Release|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Release|x64.Build.0 = Release|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Release|x86.ActiveCfg = Release|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Release|x86.Build.0 = Release|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F64AC304-FB0D-472F-9A07-6533BD1F4FB9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x64.Build.0 = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Debug|x86.Build.0 = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x64.ActiveCfg = Release|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x64.Build.0 = Release|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x86.ActiveCfg = Release|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Release|x86.Build.0 = Release|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{ECCFA0AE-EDD8-4CA1-91A3-D03A2316B9EA}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x64.Build.0 = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Debug|x86.Build.0 = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x64.ActiveCfg = Release|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x64.Build.0 = Release|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Release|x86.Build.0 = Release|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DADBC5F2-02BB-4F7F-AFA8-BE10977FCB4A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Release|x64.Build.0 = Release|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Release|x86.Build.0 = Release|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F4B28E32-E49B-400D-A81C-74E8FAF2B19A}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Release|x64.Build.0 = Release|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Release|x86.Build.0 = Release|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6798BD46-9242-4F00-A3DB-9D11E5E487E7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Release|x64.Build.0 = Release|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Release|x86.Build.0 = Release|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8E73F6BD-A0A2-4C98-B4E3-42391B135943}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Debug|x64.Build.0 = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Debug|x86.Build.0 = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Release|x64.ActiveCfg = Release|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Release|x64.Build.0 = Release|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Release|x86.ActiveCfg = Release|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Release|x86.Build.0 = Release|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F67BB87D-2927-4BD4-B21B-5A403B6A2209}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Debug|x64.Build.0 = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Debug|x86.Build.0 = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Release|x64.ActiveCfg = Release|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Release|x64.Build.0 = Release|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Release|x86.ActiveCfg = Release|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Release|x86.Build.0 = Release|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AE779AC7-EC2C-42BE-8E59-A2716799E098}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{275B161B-D525-48A0-B1DE-344273AB9A99} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{DE90AD0B-649D-4062-B8D9-9658DE140532} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0C981E9F-9018-4614-952D-EBFA1A1E4111} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E88C9976-7341-4F08-97B1-C2B1ECE58BC5}
+		SolutionGuid = {172E7B85-66A1-4DBA-823C-614EC132D306}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln b/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
index a42db01297f49e..e3a5a2f31027c4 100644
--- a/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
+++ b/src/libraries/System.Threading.Tasks.Parallel/System.Threading.Tasks.Parallel.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel.Tests", "tests\System.Threading.Tasks.Parallel.Tests.csproj", "{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F} = {A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B3656D79-6414-4037-BBF7-B112DE133703}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel", "src\System.Threading.Tasks.Parallel.csproj", "{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B} = {E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{BE3802B8-BFFB-4086-8F28-31349E249F8B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel", "ref\System.Threading.Tasks.Parallel.csproj", "{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{A010EA79-A323-460F-B7D9-B0F839179698}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{44DED62C-8063-4743-AAA1-90B3A60A646E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{3EEA4363-81A0-4A80-9E48-ACF1EB6DB639}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0D384317-E3BC-466C-BE4A-9A531F0A4D94}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel", "ref\System.Threading.Tasks.Parallel.csproj", "{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel", "src\System.Threading.Tasks.Parallel.csproj", "{8F1FE81C-C15D-459A-8758-8B0853078EA7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Parallel.Tests", "tests\System.Threading.Tasks.Parallel.Tests.csproj", "{87B76C5B-3A28-455A-AFCC-921FC3615135}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BF94265A-F723-4B13-9082-D09CFA9AEC43}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BA834E8D-9B23-43C4-BEBD-D75F651B1D20}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{435A2620-34D1-45CC-90B1-B2BDF12035F5}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B3656D79-6414-4037-BBF7-B112DE133703} = {BF94265A-F723-4B13-9082-D09CFA9AEC43}
+		{87B76C5B-3A28-455A-AFCC-921FC3615135} = {BF94265A-F723-4B13-9082-D09CFA9AEC43}
+		{BE3802B8-BFFB-4086-8F28-31349E249F8B} = {BA834E8D-9B23-43C4-BEBD-D75F651B1D20}
+		{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE} = {BA834E8D-9B23-43C4-BEBD-D75F651B1D20}
+		{44DED62C-8063-4743-AAA1-90B3A60A646E} = {BA834E8D-9B23-43C4-BEBD-D75F651B1D20}
+		{3EEA4363-81A0-4A80-9E48-ACF1EB6DB639} = {BA834E8D-9B23-43C4-BEBD-D75F651B1D20}
+		{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60} = {BA834E8D-9B23-43C4-BEBD-D75F651B1D20}
+		{A010EA79-A323-460F-B7D9-B0F839179698} = {435A2620-34D1-45CC-90B1-B2BDF12035F5}
+		{8F1FE81C-C15D-459A-8758-8B0853078EA7} = {435A2620-34D1-45CC-90B1-B2BDF12035F5}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0D384317-E3BC-466C-BE4A-9A531F0A4D94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0D384317-E3BC-466C-BE4A-9A531F0A4D94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0D384317-E3BC-466C-BE4A-9A531F0A4D94}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0D384317-E3BC-466C-BE4A-9A531F0A4D94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3656D79-6414-4037-BBF7-B112DE133703}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3656D79-6414-4037-BBF7-B112DE133703}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3656D79-6414-4037-BBF7-B112DE133703}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3656D79-6414-4037-BBF7-B112DE133703}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE3802B8-BFFB-4086-8F28-31349E249F8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE3802B8-BFFB-4086-8F28-31349E249F8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE3802B8-BFFB-4086-8F28-31349E249F8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE3802B8-BFFB-4086-8F28-31349E249F8B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89DF2FDC-F1A0-4A0D-8AED-622862BC35FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A010EA79-A323-460F-B7D9-B0F839179698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A010EA79-A323-460F-B7D9-B0F839179698}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A010EA79-A323-460F-B7D9-B0F839179698}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A010EA79-A323-460F-B7D9-B0F839179698}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44DED62C-8063-4743-AAA1-90B3A60A646E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44DED62C-8063-4743-AAA1-90B3A60A646E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44DED62C-8063-4743-AAA1-90B3A60A646E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44DED62C-8063-4743-AAA1-90B3A60A646E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EEA4363-81A0-4A80-9E48-ACF1EB6DB639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EEA4363-81A0-4A80-9E48-ACF1EB6DB639}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EEA4363-81A0-4A80-9E48-ACF1EB6DB639}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EEA4363-81A0-4A80-9E48-ACF1EB6DB639}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C757F14B-E6F5-4B89-81A7-4D8D4F3A7F60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F1FE81C-C15D-459A-8758-8B0853078EA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F1FE81C-C15D-459A-8758-8B0853078EA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F1FE81C-C15D-459A-8758-8B0853078EA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F1FE81C-C15D-459A-8758-8B0853078EA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87B76C5B-3A28-455A-AFCC-921FC3615135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87B76C5B-3A28-455A-AFCC-921FC3615135}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87B76C5B-3A28-455A-AFCC-921FC3615135}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87B76C5B-3A28-455A-AFCC-921FC3615135}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{DE29C320-2ECA-43FD-9F41-6F4F6C6BACD5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{A6BA5DF2-772E-4DA1-BC2D-89FF4A21EE4F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{E7ACD1F9-E309-4AAB-93D3-6A68FC32236B} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0D384317-E3BC-466C-BE4A-9A531F0A4D94} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0B571221-DD38-4278-AF88-FAC082DBDDED}
+		SolutionGuid = {C94E269F-E48E-43B3-96D7-BB5D57A29820}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
index ee8b1f482c4dbc..9515601049f480 100644
--- a/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
+++ b/src/libraries/System.Threading.Tasks/System.Threading.Tasks.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Tests", "tests\System.Threading.Tasks.Tests.csproj", "{B6C09633-D161-499A-8FE1-46B2D53A16E7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA} = {3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks", "src\System.Threading.Tasks.csproj", "{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C} = {27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks", "ref\System.Threading.Tasks.csproj", "{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{EAF13385-99A5-463C-9343-CE14241DD5A1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CF82B158-440B-432B-971D-55E0EE2F0789}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks", "ref\System.Threading.Tasks.csproj", "{8C762956-7AB1-4806-9144-5E13771CB22B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks", "src\System.Threading.Tasks.csproj", "{53FBD913-F587-441B-951A-195F65041CF7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Tests", "tests\System.Threading.Tasks.Tests.csproj", "{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ADE3D16E-2D6C-4BCB-A0A0-B3885298CDD9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5A05DDEF-41B2-4440-A987-875C2B05F6D1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{7C132426-E8C7-4DF1-8C94-C1A77BDAD066}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6} = {ADE3D16E-2D6C-4BCB-A0A0-B3885298CDD9}
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB} = {ADE3D16E-2D6C-4BCB-A0A0-B3885298CDD9}
+		{53FBD913-F587-441B-951A-195F65041CF7} = {ADE3D16E-2D6C-4BCB-A0A0-B3885298CDD9}
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7} = {5A05DDEF-41B2-4440-A987-875C2B05F6D1}
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8} = {5A05DDEF-41B2-4440-A987-875C2B05F6D1}
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310} = {7C132426-E8C7-4DF1-8C94-C1A77BDAD066}
+		{EAF13385-99A5-463C-9343-CE14241DD5A1} = {7C132426-E8C7-4DF1-8C94-C1A77BDAD066}
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB} = {7C132426-E8C7-4DF1-8C94-C1A77BDAD066}
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B} = {7C132426-E8C7-4DF1-8C94-C1A77BDAD066}
+		{8C762956-7AB1-4806-9144-5E13771CB22B} = {7C132426-E8C7-4DF1-8C94-C1A77BDAD066}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6C09633-D161-499A-8FE1-46B2D53A16E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF82B158-440B-432B-971D-55E0EE2F0789}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF82B158-440B-432B-971D-55E0EE2F0789}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF82B158-440B-432B-971D-55E0EE2F0789}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF82B158-440B-432B-971D-55E0EE2F0789}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Debug|Any CPU.Build.0 = Debug|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Debug|x64.ActiveCfg = Debug|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Debug|x64.Build.0 = Debug|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Debug|x86.ActiveCfg = Debug|x86
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Debug|x86.Build.0 = Debug|x86
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Release|Any CPU.ActiveCfg = Release|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Release|Any CPU.Build.0 = Release|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Release|x64.ActiveCfg = Release|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Release|x64.Build.0 = Release|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Release|x86.ActiveCfg = Release|x86
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Release|x86.Build.0 = Release|x86
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Checked|Any CPU.Build.0 = Checked|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Checked|x64.ActiveCfg = Checked|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Checked|x64.Build.0 = Checked|x64
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Checked|x86.ActiveCfg = Checked|x86
+		{2738C2DB-E488-4EA2-B981-ADB8C520DCA6}.Checked|x86.Build.0 = Checked|x86
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Debug|x64.Build.0 = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Debug|x86.Build.0 = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Release|x64.ActiveCfg = Release|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Release|x64.Build.0 = Release|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Release|x86.ActiveCfg = Release|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Release|x86.Build.0 = Release|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{695A5828-6CFC-4BE1-AE4E-6EC9796B4FC7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Debug|x64.Build.0 = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Debug|x86.Build.0 = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Release|x64.ActiveCfg = Release|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Release|x64.Build.0 = Release|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Release|x86.ActiveCfg = Release|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Release|x86.Build.0 = Release|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CDC896DE-BCA3-4A00-BADF-BCEBE29CC310}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x64.Build.0 = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Debug|x86.Build.0 = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x64.ActiveCfg = Release|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x64.Build.0 = Release|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Release|x86.Build.0 = Release|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EAF13385-99A5-463C-9343-CE14241DD5A1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x64.Build.0 = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Debug|x86.Build.0 = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x64.ActiveCfg = Release|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x64.Build.0 = Release|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x86.ActiveCfg = Release|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Release|x86.Build.0 = Release|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{6B6FDB5A-92D8-4FCB-8EFD-04F3B9B3B0BB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Release|x64.Build.0 = Release|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Release|x86.Build.0 = Release|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2B4C275F-905C-47E6-8F94-CD725D4DDEEB}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Debug|x64.Build.0 = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Debug|x86.Build.0 = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Release|x64.ActiveCfg = Release|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Release|x64.Build.0 = Release|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Release|x86.ActiveCfg = Release|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Release|x86.Build.0 = Release|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2F0E19FA-4C63-4D27-8ED1-47B941D8381B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Debug|x64.Build.0 = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Debug|x86.Build.0 = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Release|x64.ActiveCfg = Release|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Release|x64.Build.0 = Release|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Release|x86.ActiveCfg = Release|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Release|x86.Build.0 = Release|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8C762956-7AB1-4806-9144-5E13771CB22B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Debug|x64.Build.0 = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Debug|x86.Build.0 = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Release|x64.ActiveCfg = Release|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Release|x64.Build.0 = Release|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Release|x86.ActiveCfg = Release|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Release|x86.Build.0 = Release|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{53FBD913-F587-441B-951A-195F65041CF7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Debug|x64.Build.0 = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Debug|x86.Build.0 = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Release|x64.ActiveCfg = Release|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Release|x64.Build.0 = Release|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Release|x86.ActiveCfg = Release|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Release|x86.Build.0 = Release|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A8372DA8-B1DD-41ED-AD2C-C74DD5EE51D8}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{B6C09633-D161-499A-8FE1-46B2D53A16E7} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{3BCAEAA6-3A29-49EC-B334-6E7BE8BE9ABA} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{27675CCE-B6F9-4E2F-9BF2-5E623173BD5C} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{CF82B158-440B-432B-971D-55E0EE2F0789} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E29CD540-DB19-424E-8A06-E98AE46DBB22}
+		SolutionGuid = {E940CED0-8CEA-4945-9F90-D6AE2236982C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
index 21f7a971707a11..b4032340a253dc 100644
--- a/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
+++ b/src/libraries/System.Threading.Thread/System.Threading.Thread.sln
@@ -1,90 +1,267 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread.Tests", "tests\System.Threading.Thread.Tests.csproj", "{33F5A50E-B823-4FDD-8571-365C909ACEAE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{B811926D-CFBB-4C22-80D2-0CCD566D980C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DefaultApartmentStateMain", "tests\DefaultApartmentStateMain\DefaultApartmentStateMain.csproj", "{32432E07-5CA4-41F3-9855-22AB1F1E69B3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTAMain", "tests\MTAMain\MTAMain.csproj", "{06B19C7D-9EBE-420F-BD33-137DB18A1FEB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "STAMain", "tests\STAMain\STAMain.csproj", "{8045E634-C181-4C6C-AE48-71AC18D1C637}"
-	ProjectSection(ProjectDependencies) = postProject
-		{06197EED-FF48-43F3-976D-463839D43E8C} = {06197EED-FF48-43F3-976D-463839D43E8C}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread", "src\System.Threading.Thread.csproj", "{06197EED-FF48-43F3-976D-463839D43E8C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{82D06A2D-008D-4A4A-A83D-FB7F04721C87} = {82D06A2D-008D-4A4A-A83D-FB7F04721C87}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{EFE01BA2-5A04-4E14-BB16-9C84285C364F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread", "ref\System.Threading.Thread.csproj", "{82D06A2D-008D-4A4A-A83D-FB7F04721C87}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{F7A6D445-8139-42DB-8E4E-28A21E1E956D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{423D1166-13E1-47FD-A63F-9983A7238558}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread", "ref\System.Threading.Thread.csproj", "{AD5C441F-05EA-452D-B3D2-514B304AA673}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread", "src\System.Threading.Thread.csproj", "{A73DCB15-F3DF-48CB-A4CA-62102E94122C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{4C80CC37-C6BC-4ED3-9AA0-50D47ECD8AC2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DefaultApartmentStateMain", "tests\DefaultApartmentStateMain\DefaultApartmentStateMain.csproj", "{12A6F314-B08D-417D-82EC-0D8799D7C1A2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MTAMain", "tests\MTAMain\MTAMain.csproj", "{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "STAMain", "tests\STAMain\STAMain.csproj", "{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Thread.Tests", "tests\System.Threading.Thread.Tests.csproj", "{5093FB10-520B-45A1-942B-82AC0BC4FB3F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6553706B-389A-4B75-8487-9D4FB098CCA0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{5C12A1F5-9433-4E91-874C-B7C4466CF033}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{A42F6F55-F6C2-4CB4-BEDE-A26201C27F34}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C} = {6553706B-389A-4B75-8487-9D4FB098CCA0}
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F} = {6553706B-389A-4B75-8487-9D4FB098CCA0}
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C} = {6553706B-389A-4B75-8487-9D4FB098CCA0}
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9} = {5C12A1F5-9433-4E91-874C-B7C4466CF033}
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2} = {5C12A1F5-9433-4E91-874C-B7C4466CF033}
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE} = {5C12A1F5-9433-4E91-874C-B7C4466CF033}
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573} = {5C12A1F5-9433-4E91-874C-B7C4466CF033}
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F} = {5C12A1F5-9433-4E91-874C-B7C4466CF033}
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1} = {A42F6F55-F6C2-4CB4-BEDE-A26201C27F34}
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9} = {A42F6F55-F6C2-4CB4-BEDE-A26201C27F34}
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D} = {A42F6F55-F6C2-4CB4-BEDE-A26201C27F34}
+		{423D1166-13E1-47FD-A63F-9983A7238558} = {A42F6F55-F6C2-4CB4-BEDE-A26201C27F34}
+		{AD5C441F-05EA-452D-B3D2-514B304AA673} = {A42F6F55-F6C2-4CB4-BEDE-A26201C27F34}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33F5A50E-B823-4FDD-8571-365C909ACEAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33F5A50E-B823-4FDD-8571-365C909ACEAE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32432E07-5CA4-41F3-9855-22AB1F1E69B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06B19C7D-9EBE-420F-BD33-137DB18A1FEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8045E634-C181-4C6C-AE48-71AC18D1C637}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8045E634-C181-4C6C-AE48-71AC18D1C637}.Release|Any CPU.Build.0 = Release|Any CPU
-		{06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{06197EED-FF48-43F3-976D-463839D43E8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{06197EED-FF48-43F3-976D-463839D43E8C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82D06A2D-008D-4A4A-A83D-FB7F04721C87}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C80CC37-C6BC-4ED3-9AA0-50D47ECD8AC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C80CC37-C6BC-4ED3-9AA0-50D47ECD8AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C80CC37-C6BC-4ED3-9AA0-50D47ECD8AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C80CC37-C6BC-4ED3-9AA0-50D47ECD8AC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Debug|Any CPU.Build.0 = Debug|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Debug|x64.ActiveCfg = Debug|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Debug|x64.Build.0 = Debug|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Debug|x86.ActiveCfg = Debug|x86
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Debug|x86.Build.0 = Debug|x86
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Release|Any CPU.ActiveCfg = Release|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Release|Any CPU.Build.0 = Release|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Release|x64.ActiveCfg = Release|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Release|x64.Build.0 = Release|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Release|x86.ActiveCfg = Release|x86
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Release|x86.Build.0 = Release|x86
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Checked|Any CPU.Build.0 = Checked|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Checked|x64.ActiveCfg = Checked|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Checked|x64.Build.0 = Checked|x64
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Checked|x86.ActiveCfg = Checked|x86
+		{B811926D-CFBB-4C22-80D2-0CCD566D980C}.Checked|x86.Build.0 = Checked|x86
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Debug|x64.Build.0 = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Debug|x86.Build.0 = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Release|x64.ActiveCfg = Release|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Release|x64.Build.0 = Release|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Release|x86.ActiveCfg = Release|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Release|x86.Build.0 = Release|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{BF6A7CA7-DDF9-44D4-AD00-D807765663F9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Debug|x64.Build.0 = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Debug|x86.Build.0 = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Release|x64.ActiveCfg = Release|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Release|x64.Build.0 = Release|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Release|x86.ActiveCfg = Release|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Release|x86.Build.0 = Release|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5B0F3E53-24FD-4A8C-AE16-3D7E5672AEA1}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x64.Build.0 = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Debug|x86.Build.0 = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x64.ActiveCfg = Release|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x64.Build.0 = Release|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x86.ActiveCfg = Release|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Release|x86.Build.0 = Release|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{891D5917-09B5-4DEF-B9E0-7CB8866B74C9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x64.Build.0 = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Debug|x86.Build.0 = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x64.ActiveCfg = Release|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x64.Build.0 = Release|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x86.ActiveCfg = Release|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Release|x86.Build.0 = Release|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{EFE01BA2-5A04-4E14-BB16-9C84285C364F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Debug|x64.Build.0 = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Debug|x86.Build.0 = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Release|x64.ActiveCfg = Release|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Release|x64.Build.0 = Release|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Release|x86.ActiveCfg = Release|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Release|x86.Build.0 = Release|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F7A6D445-8139-42DB-8E4E-28A21E1E956D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Debug|x64.Build.0 = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Debug|x86.Build.0 = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Release|Any CPU.Build.0 = Release|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Release|x64.ActiveCfg = Release|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Release|x64.Build.0 = Release|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Release|x86.ActiveCfg = Release|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Release|x86.Build.0 = Release|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{423D1166-13E1-47FD-A63F-9983A7238558}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Debug|x64.Build.0 = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Debug|x86.Build.0 = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Release|x64.Build.0 = Release|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Release|x86.Build.0 = Release|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{AD5C441F-05EA-452D-B3D2-514B304AA673}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Debug|x64.Build.0 = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Debug|x86.Build.0 = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Release|x64.ActiveCfg = Release|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Release|x64.Build.0 = Release|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Release|x86.ActiveCfg = Release|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Release|x86.Build.0 = Release|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{A73DCB15-F3DF-48CB-A4CA-62102E94122C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Debug|x64.Build.0 = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Debug|x86.Build.0 = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Release|x64.ActiveCfg = Release|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Release|x64.Build.0 = Release|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Release|x86.ActiveCfg = Release|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Release|x86.Build.0 = Release|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{12A6F314-B08D-417D-82EC-0D8799D7C1A2}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Debug|x64.Build.0 = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Debug|x86.Build.0 = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Release|x64.ActiveCfg = Release|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Release|x64.Build.0 = Release|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Release|x86.ActiveCfg = Release|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Release|x86.Build.0 = Release|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F29BC05D-E596-4AF7-BFFC-D3E2BD8CB7AE}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Debug|x64.Build.0 = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Debug|x86.Build.0 = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Release|Any CPU.Build.0 = Release|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Release|x64.ActiveCfg = Release|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Release|x64.Build.0 = Release|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Release|x86.ActiveCfg = Release|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Release|x86.Build.0 = Release|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{33684F81-6E4B-4E90-A3B5-7C1BC02FF573}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Release|x64.Build.0 = Release|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Release|x86.Build.0 = Release|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{5093FB10-520B-45A1-942B-82AC0BC4FB3F}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{33F5A50E-B823-4FDD-8571-365C909ACEAE} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{32432E07-5CA4-41F3-9855-22AB1F1E69B3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{06B19C7D-9EBE-420F-BD33-137DB18A1FEB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{8045E634-C181-4C6C-AE48-71AC18D1C637} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{06197EED-FF48-43F3-976D-463839D43E8C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{82D06A2D-008D-4A4A-A83D-FB7F04721C87} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{4C80CC37-C6BC-4ED3-9AA0-50D47ECD8AC2} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7054E801-D6EB-41E7-8508-B27C1E056718}
+		SolutionGuid = {1D3E8D7C-10CB-4E04-B723-0B532932DF86}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
index c4ecca90c12fd0..d7fd11fe14ea77 100644
--- a/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
+++ b/src/libraries/System.Threading.ThreadPool/System.Threading.ThreadPool.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool.Tests", "tests\System.Threading.ThreadPool.Tests.csproj", "{403AD1B8-6F95-4A2E-92A2-727606ABD866}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EE797598-BA64-4150-A3AA-8FB97DA63697} = {EE797598-BA64-4150-A3AA-8FB97DA63697}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{BEACD8A1-3C09-450E-931F-561D44986BFB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool", "src\System.Threading.ThreadPool.csproj", "{EE797598-BA64-4150-A3AA-8FB97DA63697}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3A5A0D64-7796-4BC2-8288-4B04B97C4A70} = {3A5A0D64-7796-4BC2-8288-4B04B97C4A70}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{CD477FC8-AF27-46A2-A451-4A2D4C11600D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool", "ref\System.Threading.ThreadPool.csproj", "{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{B317661F-0A92-4351-A6AE-FBCAB9B423B9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{969E8154-9D99-49CB-B435-F5E4936DDE58}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{3440C79D-9158-4D66-9018-5194272AAD4B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{0EB5CC62-102F-42EB-A37D-0C74D54A4203}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E4D6005C-557E-4C87-9073-B3E31F6F210A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D11634B3-ED3D-4D77-8319-B9798327F844}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool", "ref\System.Threading.ThreadPool.csproj", "{54134937-585D-48D5-AB60-79493BE2C9E7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool", "src\System.Threading.ThreadPool.csproj", "{53A0D29E-8633-4FF8-AB0E-86EF331DD379}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.ThreadPool.Tests", "tests\System.Threading.ThreadPool.Tests.csproj", "{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{11EE3F64-7EC4-4E89-9C3C-334258DEEA27}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{52D0B902-E248-48D1-818F-E5F5223D9F1A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{BE629098-2F8C-405D-BA68-5F0228708F01}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{BEACD8A1-3C09-450E-931F-561D44986BFB} = {11EE3F64-7EC4-4E89-9C3C-334258DEEA27}
+		{3440C79D-9158-4D66-9018-5194272AAD4B} = {11EE3F64-7EC4-4E89-9C3C-334258DEEA27}
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379} = {11EE3F64-7EC4-4E89-9C3C-334258DEEA27}
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D} = {52D0B902-E248-48D1-818F-E5F5223D9F1A}
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75} = {52D0B902-E248-48D1-818F-E5F5223D9F1A}
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9} = {BE629098-2F8C-405D-BA68-5F0228708F01}
+		{969E8154-9D99-49CB-B435-F5E4936DDE58} = {BE629098-2F8C-405D-BA68-5F0228708F01}
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203} = {BE629098-2F8C-405D-BA68-5F0228708F01}
+		{D11634B3-ED3D-4D77-8319-B9798327F844} = {BE629098-2F8C-405D-BA68-5F0228708F01}
+		{54134937-585D-48D5-AB60-79493BE2C9E7} = {BE629098-2F8C-405D-BA68-5F0228708F01}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{403AD1B8-6F95-4A2E-92A2-727606ABD866}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EE797598-BA64-4150-A3AA-8FB97DA63697}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EE797598-BA64-4150-A3AA-8FB97DA63697}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3A5A0D64-7796-4BC2-8288-4B04B97C4A70}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E4D6005C-557E-4C87-9073-B3E31F6F210A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E4D6005C-557E-4C87-9073-B3E31F6F210A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E4D6005C-557E-4C87-9073-B3E31F6F210A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E4D6005C-557E-4C87-9073-B3E31F6F210A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Debug|Any CPU.Build.0 = Debug|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Debug|x64.ActiveCfg = Debug|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Debug|x64.Build.0 = Debug|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Debug|x86.ActiveCfg = Debug|x86
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Debug|x86.Build.0 = Debug|x86
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Release|Any CPU.ActiveCfg = Release|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Release|Any CPU.Build.0 = Release|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Release|x64.ActiveCfg = Release|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Release|x64.Build.0 = Release|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Release|x86.ActiveCfg = Release|x86
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Release|x86.Build.0 = Release|x86
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Checked|Any CPU.Build.0 = Checked|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Checked|x64.ActiveCfg = Checked|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Checked|x64.Build.0 = Checked|x64
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Checked|x86.ActiveCfg = Checked|x86
+		{BEACD8A1-3C09-450E-931F-561D44986BFB}.Checked|x86.Build.0 = Checked|x86
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Debug|x64.Build.0 = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Debug|x86.Build.0 = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Release|x64.ActiveCfg = Release|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Release|x64.Build.0 = Release|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Release|x86.ActiveCfg = Release|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Release|x86.Build.0 = Release|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CD477FC8-AF27-46A2-A451-4A2D4C11600D}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Debug|x64.Build.0 = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Debug|x86.Build.0 = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Release|x64.ActiveCfg = Release|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Release|x64.Build.0 = Release|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Release|x86.ActiveCfg = Release|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Release|x86.Build.0 = Release|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{B317661F-0A92-4351-A6AE-FBCAB9B423B9}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x64.Build.0 = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Debug|x86.Build.0 = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x64.ActiveCfg = Release|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x64.Build.0 = Release|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x86.ActiveCfg = Release|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Release|x86.Build.0 = Release|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{969E8154-9D99-49CB-B435-F5E4936DDE58}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x64.Build.0 = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Debug|x86.Build.0 = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x64.ActiveCfg = Release|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x64.Build.0 = Release|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x86.ActiveCfg = Release|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Release|x86.Build.0 = Release|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3440C79D-9158-4D66-9018-5194272AAD4B}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Debug|x64.Build.0 = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Debug|x86.Build.0 = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Release|x64.ActiveCfg = Release|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Release|x64.Build.0 = Release|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Release|x86.ActiveCfg = Release|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Release|x86.Build.0 = Release|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0EB5CC62-102F-42EB-A37D-0C74D54A4203}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Debug|x64.Build.0 = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Debug|x86.Build.0 = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Release|x64.ActiveCfg = Release|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Release|x64.Build.0 = Release|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Release|x86.ActiveCfg = Release|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Release|x86.Build.0 = Release|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D11634B3-ED3D-4D77-8319-B9798327F844}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Release|x64.Build.0 = Release|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Release|x86.Build.0 = Release|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{54134937-585D-48D5-AB60-79493BE2C9E7}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Debug|x64.Build.0 = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Debug|x86.Build.0 = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Release|x64.ActiveCfg = Release|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Release|x64.Build.0 = Release|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Release|x86.ActiveCfg = Release|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Release|x86.Build.0 = Release|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{53A0D29E-8633-4FF8-AB0E-86EF331DD379}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Debug|x64.Build.0 = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Debug|x86.Build.0 = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Release|Any CPU.Build.0 = Release|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Release|x64.ActiveCfg = Release|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Release|x64.Build.0 = Release|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Release|x86.ActiveCfg = Release|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Release|x86.Build.0 = Release|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{71ACA28C-A4F1-4A07-A1B3-39DB86C11A75}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{403AD1B8-6F95-4A2E-92A2-727606ABD866} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{EE797598-BA64-4150-A3AA-8FB97DA63697} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{3A5A0D64-7796-4BC2-8288-4B04B97C4A70} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{E4D6005C-557E-4C87-9073-B3E31F6F210A} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {032B9801-FB0C-41E7-BC04-3845029B5C0F}
+		SolutionGuid = {6124532E-4272-44A6-954B-A7B0FF9D694A}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
index 6e43f2f2dd63e3..85d457df678fce 100644
--- a/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
+++ b/src/libraries/System.Threading.Timer/System.Threading.Timer.sln
@@ -1,60 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer.Tests", "tests\System.Threading.Timer.Tests.csproj", "{ac20a28f-fda8-45e8-8728-058ead16e44c}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0F8B87B4-0E61-4DC6-9E90-CD4863025272} = {0F8B87B4-0E61-4DC6-9E90-CD4863025272}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{74D4C464-F319-4A9D-8F09-C50FDBA1547A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer", "src\System.Threading.Timer.csproj", "{0F8B87B4-0E61-4DC6-9E90-CD4863025272}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DC78B562-4F74-49C2-9766-3B65CD610CCC} = {DC78B562-4F74-49C2-9766-3B65CD610CCC}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{567E9CC8-5751-4786-BCC6-C2A6C38044DF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer", "ref\System.Threading.Timer.csproj", "{DC78B562-4F74-49C2-9766-3B65CD610CCC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{98FBF74D-9544-4B64-B126-49FA876D62EC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0DC8F257-3D2E-4CFF-B54D-139FD03569E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{05314F23-71CD-492B-B039-17ECD86DFF4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer", "ref\System.Threading.Timer.csproj", "{CF3D7FED-A927-4611-891F-AB3516B71D44}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer", "src\System.Threading.Timer.csproj", "{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Timer.Tests", "tests\System.Threading.Timer.Tests.csproj", "{DAB761D6-EDD5-4F57-9BDE-E26589057403}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C0F742CB-5368-42A1-9681-D4ACB38D94C3}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{11966395-AE60-499D-91C6-5D49C12CE670}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{84AFABD8-7BCB-4619-A99D-03CCAD163B5F}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A} = {C0F742CB-5368-42A1-9681-D4ACB38D94C3}
+		{98FBF74D-9544-4B64-B126-49FA876D62EC} = {C0F742CB-5368-42A1-9681-D4ACB38D94C3}
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5} = {C0F742CB-5368-42A1-9681-D4ACB38D94C3}
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF} = {11966395-AE60-499D-91C6-5D49C12CE670}
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403} = {11966395-AE60-499D-91C6-5D49C12CE670}
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC} = {84AFABD8-7BCB-4619-A99D-03CCAD163B5F}
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C} = {84AFABD8-7BCB-4619-A99D-03CCAD163B5F}
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5} = {84AFABD8-7BCB-4619-A99D-03CCAD163B5F}
+		{05314F23-71CD-492B-B039-17ECD86DFF4F} = {84AFABD8-7BCB-4619-A99D-03CCAD163B5F}
+		{CF3D7FED-A927-4611-891F-AB3516B71D44} = {84AFABD8-7BCB-4619-A99D-03CCAD163B5F}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ac20a28f-fda8-45e8-8728-058ead16e44c}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ac20a28f-fda8-45e8-8728-058ead16e44c}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F8B87B4-0E61-4DC6-9E90-CD4863025272}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC78B562-4F74-49C2-9766-3B65CD610CCC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DC8F257-3D2E-4CFF-B54D-139FD03569E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DC8F257-3D2E-4CFF-B54D-139FD03569E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DC8F257-3D2E-4CFF-B54D-139FD03569E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DC8F257-3D2E-4CFF-B54D-139FD03569E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Debug|Any CPU.Build.0 = Debug|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Debug|x64.ActiveCfg = Debug|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Debug|x64.Build.0 = Debug|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Debug|x86.ActiveCfg = Debug|x86
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Debug|x86.Build.0 = Debug|x86
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Release|Any CPU.ActiveCfg = Release|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Release|Any CPU.Build.0 = Release|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Release|x64.ActiveCfg = Release|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Release|x64.Build.0 = Release|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Release|x86.ActiveCfg = Release|x86
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Release|x86.Build.0 = Release|x86
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Checked|Any CPU.Build.0 = Checked|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Checked|x64.ActiveCfg = Checked|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Checked|x64.Build.0 = Checked|x64
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Checked|x86.ActiveCfg = Checked|x86
+		{74D4C464-F319-4A9D-8F09-C50FDBA1547A}.Checked|x86.Build.0 = Checked|x86
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Debug|x64.Build.0 = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Debug|x86.Build.0 = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Release|x64.ActiveCfg = Release|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Release|x64.Build.0 = Release|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Release|x86.ActiveCfg = Release|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Release|x86.Build.0 = Release|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{567E9CC8-5751-4786-BCC6-C2A6C38044DF}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Debug|x64.Build.0 = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Debug|x86.Build.0 = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Release|x64.ActiveCfg = Release|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Release|x64.Build.0 = Release|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Release|x86.ActiveCfg = Release|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Release|x86.Build.0 = Release|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{FFB9A6C5-8145-44D9-B7FF-1B2E6E7A60EC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x64.Build.0 = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Debug|x86.Build.0 = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x64.Build.0 = Release|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x86.ActiveCfg = Release|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Release|x86.Build.0 = Release|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DD59BC62-51E9-43BF-BAE2-B5B6443B5C4C}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x64.Build.0 = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Debug|x86.Build.0 = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x64.ActiveCfg = Release|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x64.Build.0 = Release|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x86.ActiveCfg = Release|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Release|x86.Build.0 = Release|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{98FBF74D-9544-4B64-B126-49FA876D62EC}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Release|x64.Build.0 = Release|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Release|x86.Build.0 = Release|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{52A8C0D4-D244-4CA0-B134-9BC28AF05DE5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Debug|x64.Build.0 = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Debug|x86.Build.0 = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Release|x64.ActiveCfg = Release|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Release|x64.Build.0 = Release|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Release|x86.ActiveCfg = Release|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Release|x86.Build.0 = Release|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{05314F23-71CD-492B-B039-17ECD86DFF4F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Debug|x64.Build.0 = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Release|x64.ActiveCfg = Release|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Release|x64.Build.0 = Release|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Release|x86.Build.0 = Release|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{CF3D7FED-A927-4611-891F-AB3516B71D44}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Debug|x64.Build.0 = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Debug|x86.Build.0 = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Release|x64.ActiveCfg = Release|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Release|x64.Build.0 = Release|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Release|x86.ActiveCfg = Release|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Release|x86.Build.0 = Release|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2B942D1B-20DE-427E-9D46-F1C513C7FFF5}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Debug|x64.Build.0 = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Debug|x86.Build.0 = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Release|x64.ActiveCfg = Release|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Release|x64.Build.0 = Release|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Release|x86.ActiveCfg = Release|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Release|x86.Build.0 = Release|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{DAB761D6-EDD5-4F57-9BDE-E26589057403}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{ac20a28f-fda8-45e8-8728-058ead16e44c} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{0F8B87B4-0E61-4DC6-9E90-CD4863025272} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{DC78B562-4F74-49C2-9766-3B65CD610CCC} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0DC8F257-3D2E-4CFF-B54D-139FD03569E5} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {9B7377AE-E32F-4B15-8585-4DAC3767E023}
+		SolutionGuid = {D406182A-5509-4CB1-8537-471431BC771B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln
index 9a376c5998cf0d..61409afd22c783 100644
--- a/src/libraries/System.Threading/System.Threading.sln
+++ b/src/libraries/System.Threading/System.Threading.sln
@@ -1,67 +1,213 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tests", "tests\System.Threading.Tests.csproj", "{18EF66B3-51EE-46D8-B283-1CB6A1197813}"
-	ProjectSection(ProjectDependencies) = postProject
-		{604027F5-1DFC-42F4-B4FE-61F8789BA647} = {604027F5-1DFC-42F4-B4FE-61F8789BA647}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\src\System.Private.CoreLib\System.Private.CoreLib.csproj", "{1F14F4DD-AE65-407B-9E10-F5786A847AD6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "src\System.Threading.csproj", "{604027F5-1DFC-42F4-B4FE-61F8789BA647}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F59F13CA-829A-4D02-9A1D-E40E61257177} = {F59F13CA-829A-4D02-9A1D-E40E61257177}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{387778C0-0405-4FE2-9D85-034254EAAD46}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "ref\System.Threading.csproj", "{F59F13CA-829A-4D02-9A1D-E40E61257177}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3F9739D6-F533-4365-A2BB-448C5BE61AF3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{120AAA2F-6798-4C03-BFEB-656466A78B04}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{8F76400B-7B47-44AA-9B10-F8CFF43B4446}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7B12728C-1240-44E4-9989-439925F464D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{D30F94B6-27DF-45CC-917E-EA63F4DA0015}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions", "..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj", "{81A726B8-EB35-4762-8B5E-C88F7FD0AE7E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "ref\System.Threading.csproj", "{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading", "src\System.Threading.csproj", "{F4D0710C-6A53-44F9-A28B-63F008FEF808}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tests", "tests\System.Threading.Tests.csproj", "{3DD929D8-346F-4CF3-B157-22E052F73A91}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B4487CE-1A7E-4548-AD80-7D1655CCCFCD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{12B464CD-1866-477D-8F14-0DB19B13A2EA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{5F0242E8-5E12-49F2-B402-3A60505B0A8C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6} = {4B4487CE-1A7E-4548-AD80-7D1655CCCFCD}
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F} = {4B4487CE-1A7E-4548-AD80-7D1655CCCFCD}
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808} = {4B4487CE-1A7E-4548-AD80-7D1655CCCFCD}
+		{387778C0-0405-4FE2-9D85-034254EAAD46} = {12B464CD-1866-477D-8F14-0DB19B13A2EA}
+		{3DD929D8-346F-4CF3-B157-22E052F73A91} = {12B464CD-1866-477D-8F14-0DB19B13A2EA}
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3} = {5F0242E8-5E12-49F2-B402-3A60505B0A8C}
+		{120AAA2F-6798-4C03-BFEB-656466A78B04} = {5F0242E8-5E12-49F2-B402-3A60505B0A8C}
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446} = {5F0242E8-5E12-49F2-B402-3A60505B0A8C}
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015} = {5F0242E8-5E12-49F2-B402-3A60505B0A8C}
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49} = {5F0242E8-5E12-49F2-B402-3A60505B0A8C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		Checked|Any CPU = Checked|Any CPU
+		Checked|x64 = Checked|x64
+		Checked|x86 = Checked|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{18EF66B3-51EE-46D8-B283-1CB6A1197813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18EF66B3-51EE-46D8-B283-1CB6A1197813}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18EF66B3-51EE-46D8-B283-1CB6A1197813}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{18EF66B3-51EE-46D8-B283-1CB6A1197813}.Release|Any CPU.Build.0 = Release|Any CPU
-		{604027F5-1DFC-42F4-B4FE-61F8789BA647}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{604027F5-1DFC-42F4-B4FE-61F8789BA647}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{604027F5-1DFC-42F4-B4FE-61F8789BA647}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{604027F5-1DFC-42F4-B4FE-61F8789BA647}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F59F13CA-829A-4D02-9A1D-E40E61257177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F59F13CA-829A-4D02-9A1D-E40E61257177}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F59F13CA-829A-4D02-9A1D-E40E61257177}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F59F13CA-829A-4D02-9A1D-E40E61257177}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B12728C-1240-44E4-9989-439925F464D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B12728C-1240-44E4-9989-439925F464D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B12728C-1240-44E4-9989-439925F464D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B12728C-1240-44E4-9989-439925F464D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81A726B8-EB35-4762-8B5E-C88F7FD0AE7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81A726B8-EB35-4762-8B5E-C88F7FD0AE7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81A726B8-EB35-4762-8B5E-C88F7FD0AE7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81A726B8-EB35-4762-8B5E-C88F7FD0AE7E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Debug|Any CPU.Build.0 = Debug|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Debug|x64.ActiveCfg = Debug|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Debug|x64.Build.0 = Debug|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Debug|x86.ActiveCfg = Debug|x86
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Debug|x86.Build.0 = Debug|x86
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Release|Any CPU.ActiveCfg = Release|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Release|Any CPU.Build.0 = Release|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Release|x64.ActiveCfg = Release|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Release|x64.Build.0 = Release|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Release|x86.ActiveCfg = Release|x86
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Release|x86.Build.0 = Release|x86
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Checked|Any CPU.ActiveCfg = Checked|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Checked|Any CPU.Build.0 = Checked|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Checked|x64.ActiveCfg = Checked|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Checked|x64.Build.0 = Checked|x64
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Checked|x86.ActiveCfg = Checked|x86
+		{1F14F4DD-AE65-407B-9E10-F5786A847AD6}.Checked|x86.Build.0 = Checked|x86
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Debug|x64.Build.0 = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Debug|x86.Build.0 = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Release|x64.ActiveCfg = Release|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Release|x64.Build.0 = Release|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Release|x86.ActiveCfg = Release|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Release|x86.Build.0 = Release|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{387778C0-0405-4FE2-9D85-034254EAAD46}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Debug|x64.Build.0 = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Debug|x86.Build.0 = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Release|x64.ActiveCfg = Release|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Release|x64.Build.0 = Release|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Release|x86.ActiveCfg = Release|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Release|x86.Build.0 = Release|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3F9739D6-F533-4365-A2BB-448C5BE61AF3}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x64.Build.0 = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Debug|x86.Build.0 = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|Any CPU.Build.0 = Release|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x64.ActiveCfg = Release|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x64.Build.0 = Release|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x86.ActiveCfg = Release|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Release|x86.Build.0 = Release|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{120AAA2F-6798-4C03-BFEB-656466A78B04}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x64.Build.0 = Release|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Release|x86.Build.0 = Release|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{2CE21C30-5734-42DA-BB23-E72AD4F15F3F}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Debug|x64.Build.0 = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Debug|x86.Build.0 = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Release|x64.ActiveCfg = Release|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Release|x64.Build.0 = Release|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Release|x86.Build.0 = Release|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{8F76400B-7B47-44AA-9B10-F8CFF43B4446}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Debug|x64.Build.0 = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Debug|x86.Build.0 = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Release|x64.ActiveCfg = Release|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Release|x64.Build.0 = Release|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Release|x86.ActiveCfg = Release|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Release|x86.Build.0 = Release|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{D30F94B6-27DF-45CC-917E-EA63F4DA0015}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Debug|x64.Build.0 = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Debug|x86.Build.0 = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Release|x64.ActiveCfg = Release|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Release|x64.Build.0 = Release|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Release|x86.ActiveCfg = Release|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Release|x86.Build.0 = Release|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{0B7B0E9C-6B63-42F2-ABFF-DB46EE7EAD49}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Debug|x64.Build.0 = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Debug|x86.Build.0 = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Release|x64.ActiveCfg = Release|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Release|x64.Build.0 = Release|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Release|x86.ActiveCfg = Release|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Release|x86.Build.0 = Release|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{F4D0710C-6A53-44F9-A28B-63F008FEF808}.Checked|x86.ActiveCfg = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Debug|x64.Build.0 = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Debug|x86.Build.0 = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Release|x64.ActiveCfg = Release|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Release|x64.Build.0 = Release|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Release|x86.ActiveCfg = Release|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Release|x86.Build.0 = Release|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Checked|x64.ActiveCfg = Debug|Any CPU
+		{3DD929D8-346F-4CF3-B157-22E052F73A91}.Checked|x86.ActiveCfg = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{18EF66B3-51EE-46D8-B283-1CB6A1197813} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{604027F5-1DFC-42F4-B4FE-61F8789BA647} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F59F13CA-829A-4D02-9A1D-E40E61257177} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7B12728C-1240-44E4-9989-439925F464D3} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{81A726B8-EB35-4762-8B5E-C88F7FD0AE7E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6CD053C6-9C97-470C-AD05-3EDD28D57C55}
+		SolutionGuid = {859F6F1F-8DF9-4E85-B288-50B9149EDD81}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
index 8affba083d1f90..2740df75ff65ae 100644
--- a/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
+++ b/src/libraries/System.Transactions.Local/System.Transactions.Local.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local.Tests", "tests\System.Transactions.Local.Tests.csproj", "{1C397868-9644-48CB-94BF-35805C4AE024}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E97557E3-7DB1-4828-ACA5-44D8C68B6698} = {E97557E3-7DB1-4828-ACA5-44D8C68B6698}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local", "src\System.Transactions.Local.csproj", "{E97557E3-7DB1-4828-ACA5-44D8C68B6698}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4} = {A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{5F04666F-4482-4376-9B1E-57D6DED8F4B5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local", "ref\System.Transactions.Local.csproj", "{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{EA11DEEB-119C-418F-A954-4A0067504025}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{2879AFE4-C09F-4570-9443-976E1D19B03E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{F891D04B-40AE-41E3-B00F-8E4E5448AB24}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{0F5FDCA3-6289-438A-A68C-9C5392C9E10C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local", "ref\System.Transactions.Local.csproj", "{0C886713-72D7-43C7-A1BB-72CD0F8430D2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local", "src\System.Transactions.Local.csproj", "{6BFF19CB-C412-4D12-AA55-68D61F69C4F7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Transactions.Local.Tests", "tests\System.Transactions.Local.Tests.csproj", "{C5519C4C-69AF-4437-8594-D2A019119988}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{858CE8C2-8A0B-4076-A9FB-2A4A107EF24E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DF4C0AA2-0846-4CF8-9F11-0A22A199FC19}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C68DC54B-1B6B-4224-AE16-742D3B79905C}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C} = {858CE8C2-8A0B-4076-A9FB-2A4A107EF24E}
+		{C5519C4C-69AF-4437-8594-D2A019119988} = {858CE8C2-8A0B-4076-A9FB-2A4A107EF24E}
+		{5F04666F-4482-4376-9B1E-57D6DED8F4B5} = {DF4C0AA2-0846-4CF8-9F11-0A22A199FC19}
+		{EA11DEEB-119C-418F-A954-4A0067504025} = {DF4C0AA2-0846-4CF8-9F11-0A22A199FC19}
+		{2879AFE4-C09F-4570-9443-976E1D19B03E} = {DF4C0AA2-0846-4CF8-9F11-0A22A199FC19}
+		{F891D04B-40AE-41E3-B00F-8E4E5448AB24} = {DF4C0AA2-0846-4CF8-9F11-0A22A199FC19}
+		{0C886713-72D7-43C7-A1BB-72CD0F8430D2} = {DF4C0AA2-0846-4CF8-9F11-0A22A199FC19}
+		{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5} = {C68DC54B-1B6B-4224-AE16-742D3B79905C}
+		{6BFF19CB-C412-4D12-AA55-68D61F69C4F7} = {C68DC54B-1B6B-4224-AE16-742D3B79905C}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1C397868-9644-48CB-94BF-35805C4AE024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1C397868-9644-48CB-94BF-35805C4AE024}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1C397868-9644-48CB-94BF-35805C4AE024}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1C397868-9644-48CB-94BF-35805C4AE024}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E97557E3-7DB1-4828-ACA5-44D8C68B6698}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F5FDCA3-6289-438A-A68C-9C5392C9E10C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F5FDCA3-6289-438A-A68C-9C5392C9E10C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F5FDCA3-6289-438A-A68C-9C5392C9E10C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F5FDCA3-6289-438A-A68C-9C5392C9E10C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B67D04B7-C5ED-44ED-8DB3-8AD788232A5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F04666F-4482-4376-9B1E-57D6DED8F4B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F04666F-4482-4376-9B1E-57D6DED8F4B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F04666F-4482-4376-9B1E-57D6DED8F4B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F04666F-4482-4376-9B1E-57D6DED8F4B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA11DEEB-119C-418F-A954-4A0067504025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA11DEEB-119C-418F-A954-4A0067504025}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA11DEEB-119C-418F-A954-4A0067504025}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA11DEEB-119C-418F-A954-4A0067504025}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B01CE070-4B5A-4BE8-BBB9-2F8B0E5E43B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2879AFE4-C09F-4570-9443-976E1D19B03E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2879AFE4-C09F-4570-9443-976E1D19B03E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2879AFE4-C09F-4570-9443-976E1D19B03E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2879AFE4-C09F-4570-9443-976E1D19B03E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F891D04B-40AE-41E3-B00F-8E4E5448AB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F891D04B-40AE-41E3-B00F-8E4E5448AB24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F891D04B-40AE-41E3-B00F-8E4E5448AB24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F891D04B-40AE-41E3-B00F-8E4E5448AB24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C886713-72D7-43C7-A1BB-72CD0F8430D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6BFF19CB-C412-4D12-AA55-68D61F69C4F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6BFF19CB-C412-4D12-AA55-68D61F69C4F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6BFF19CB-C412-4D12-AA55-68D61F69C4F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6BFF19CB-C412-4D12-AA55-68D61F69C4F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5519C4C-69AF-4437-8594-D2A019119988}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C5519C4C-69AF-4437-8594-D2A019119988}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5519C4C-69AF-4437-8594-D2A019119988}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C5519C4C-69AF-4437-8594-D2A019119988}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1C397868-9644-48CB-94BF-35805C4AE024} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E97557E3-7DB1-4828-ACA5-44D8C68B6698} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{A0C4383D-B0B0-492F-AEEE-CA1BC6E5B6D4} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{0F5FDCA3-6289-438A-A68C-9C5392C9E10C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6B0E9A0E-19DC-4507-8B5E-DF29F2B186D0}
+		SolutionGuid = {197B13C9-4EA6-408B-8EF6-B551B2A58A89}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.ValueTuple/System.ValueTuple.sln b/src/libraries/System.ValueTuple/System.ValueTuple.sln
index b49266d0fd4729..adc579996192d0 100644
--- a/src/libraries/System.ValueTuple/System.ValueTuple.sln
+++ b/src/libraries/System.ValueTuple/System.ValueTuple.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple.Tests", "tests\System.ValueTuple.Tests.csproj", "{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29} = {4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E7F22DF6-4869-4B34-BCFA-D007FE89616C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple", "src\System.ValueTuple.csproj", "{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}"
-	ProjectSection(ProjectDependencies) = postProject
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456D} = {11AE73F7-3532-47B9-8FF6-B4F22D76456D}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{D52E5291-FF1D-43F5-8BD6-4546BFFB7FF5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple", "ref\System.ValueTuple.csproj", "{11AE73F7-3532-47B9-8FF6-B4F22D76456D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{0405F77B-A8AE-47A9-9880-68B7A238DB21}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{63D5BFEA-99F5-4DAF-8793-5B0C0615B210}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{223C81BA-EE1B-4660-B0D7-29E2B4791743}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{4E8486DB-62DA-4D3F-A677-5887F891256F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{B6303241-90AC-4094-AFCE-803E6E1136AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple", "ref\System.ValueTuple.csproj", "{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple", "src\System.ValueTuple.csproj", "{F4EDEAED-F616-41EE-9FBA-76986DCDB528}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ValueTuple.Tests", "tests\System.ValueTuple.Tests.csproj", "{3070EAA5-CBA9-4359-844B-2EFCDDC37020}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3F8BA399-B525-4BC1-8AF6-F84825DDC5BA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F7C087B6-A4C1-4ADF-8F55-5F1DC5FD4E5B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{81A0ED73-BF10-4DE5-A1F5-F09F030DC8B7}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E7F22DF6-4869-4B34-BCFA-D007FE89616C} = {3F8BA399-B525-4BC1-8AF6-F84825DDC5BA}
+		{3070EAA5-CBA9-4359-844B-2EFCDDC37020} = {3F8BA399-B525-4BC1-8AF6-F84825DDC5BA}
+		{D52E5291-FF1D-43F5-8BD6-4546BFFB7FF5} = {F7C087B6-A4C1-4ADF-8F55-5F1DC5FD4E5B}
+		{0405F77B-A8AE-47A9-9880-68B7A238DB21} = {F7C087B6-A4C1-4ADF-8F55-5F1DC5FD4E5B}
+		{223C81BA-EE1B-4660-B0D7-29E2B4791743} = {F7C087B6-A4C1-4ADF-8F55-5F1DC5FD4E5B}
+		{4E8486DB-62DA-4D3F-A677-5887F891256F} = {F7C087B6-A4C1-4ADF-8F55-5F1DC5FD4E5B}
+		{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1} = {F7C087B6-A4C1-4ADF-8F55-5F1DC5FD4E5B}
+		{63D5BFEA-99F5-4DAF-8793-5B0C0615B210} = {81A0ED73-BF10-4DE5-A1F5-F09F030DC8B7}
+		{F4EDEAED-F616-41EE-9FBA-76986DCDB528} = {81A0ED73-BF10-4DE5-A1F5-F09F030DC8B7}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBD5AE8D-8595-48E2-848F-1A3492A28FDB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6303241-90AC-4094-AFCE-803E6E1136AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6303241-90AC-4094-AFCE-803E6E1136AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6303241-90AC-4094-AFCE-803E6E1136AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6303241-90AC-4094-AFCE-803E6E1136AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E7F22DF6-4869-4B34-BCFA-D007FE89616C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D52E5291-FF1D-43F5-8BD6-4546BFFB7FF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D52E5291-FF1D-43F5-8BD6-4546BFFB7FF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D52E5291-FF1D-43F5-8BD6-4546BFFB7FF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D52E5291-FF1D-43F5-8BD6-4546BFFB7FF5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0405F77B-A8AE-47A9-9880-68B7A238DB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0405F77B-A8AE-47A9-9880-68B7A238DB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0405F77B-A8AE-47A9-9880-68B7A238DB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0405F77B-A8AE-47A9-9880-68B7A238DB21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63D5BFEA-99F5-4DAF-8793-5B0C0615B210}.Release|Any CPU.Build.0 = Release|Any CPU
+		{223C81BA-EE1B-4660-B0D7-29E2B4791743}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{223C81BA-EE1B-4660-B0D7-29E2B4791743}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{223C81BA-EE1B-4660-B0D7-29E2B4791743}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{223C81BA-EE1B-4660-B0D7-29E2B4791743}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E8486DB-62DA-4D3F-A677-5887F891256F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E8486DB-62DA-4D3F-A677-5887F891256F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E8486DB-62DA-4D3F-A677-5887F891256F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E8486DB-62DA-4D3F-A677-5887F891256F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F48CCB0E-7FA3-490A-BCF0-9918C496D3B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4EDEAED-F616-41EE-9FBA-76986DCDB528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4EDEAED-F616-41EE-9FBA-76986DCDB528}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4EDEAED-F616-41EE-9FBA-76986DCDB528}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4EDEAED-F616-41EE-9FBA-76986DCDB528}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3070EAA5-CBA9-4359-844B-2EFCDDC37020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3070EAA5-CBA9-4359-844B-2EFCDDC37020}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3070EAA5-CBA9-4359-844B-2EFCDDC37020}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3070EAA5-CBA9-4359-844B-2EFCDDC37020}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{CBD5AE8D-8595-48E2-848F-1A3492A28FDB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{4C2655DB-BD9E-4C86-83A6-744ECDDBDF29} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{11AE73F7-3532-47B9-8FF6-B4F22D76456D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{B6303241-90AC-4094-AFCE-803E6E1136AB} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DC3F0B38-F32E-4F1E-9FC9-B541747AC4F3}
+		SolutionGuid = {B203AA51-F643-4542-8F44-E337F58D2C61}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
index 098655bc199cf2..5e6855ce5346fc 100644
--- a/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
+++ b/src/libraries/System.Web.HttpUtility/System.Web.HttpUtility.sln
@@ -1,60 +1,86 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility.Tests", "tests\System.Web.HttpUtility.Tests.csproj", "{914279EE-58B1-4B27-BA18-66D988C8DFFA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CE959FC9-5E04-4F29-96B5-454BF3E76306} = {CE959FC9-5E04-4F29-96B5-454BF3E76306}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{DE086FBB-952B-491A-A59C-733C33682562}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility", "src\System.Web.HttpUtility.csproj", "{CE959FC9-5E04-4F29-96B5-454BF3E76306}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CB57F978-2BA8-4BF3-A755-A032030974A0} = {CB57F978-2BA8-4BF3-A755-A032030974A0}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{3F33730C-497E-419A-A792-61DB2B936C10}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility", "ref\System.Web.HttpUtility.csproj", "{CB57F978-2BA8-4BF3-A755-A032030974A0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{2529A763-7FF2-470F-8B61-B687B739B756}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{FA4BA62E-70F4-4280-A756-0E4046A5B365}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{12E52512-1A77-4DE6-BBBC-3EFD0AB04D91}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{8B26C383-DB8A-4716-9B44-6038C36E370F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{7B451E08-E47D-42A3-AD91-8C697A311759}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility", "ref\System.Web.HttpUtility.csproj", "{063B8BE1-1713-40FE-BD22-A258FD50108E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility", "src\System.Web.HttpUtility.csproj", "{C294097C-8171-4FA2-9C58-11A7FE3BEBDA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Web.HttpUtility.Tests", "tests\System.Web.HttpUtility.Tests.csproj", "{BA3C5AE7-937C-47E1-B861-1F149499889F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{8383E3CF-DD6E-40E3-9596-2E80EC06F623}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{3C05F087-13BF-4207-B5DE-D08AAB41057F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BF2F381D-E865-43BD-9439-20831B9785DE}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{DE086FBB-952B-491A-A59C-733C33682562} = {8383E3CF-DD6E-40E3-9596-2E80EC06F623}
+		{BA3C5AE7-937C-47E1-B861-1F149499889F} = {8383E3CF-DD6E-40E3-9596-2E80EC06F623}
+		{3F33730C-497E-419A-A792-61DB2B936C10} = {3C05F087-13BF-4207-B5DE-D08AAB41057F}
+		{2529A763-7FF2-470F-8B61-B687B739B756} = {3C05F087-13BF-4207-B5DE-D08AAB41057F}
+		{12E52512-1A77-4DE6-BBBC-3EFD0AB04D91} = {3C05F087-13BF-4207-B5DE-D08AAB41057F}
+		{8B26C383-DB8A-4716-9B44-6038C36E370F} = {3C05F087-13BF-4207-B5DE-D08AAB41057F}
+		{063B8BE1-1713-40FE-BD22-A258FD50108E} = {3C05F087-13BF-4207-B5DE-D08AAB41057F}
+		{FA4BA62E-70F4-4280-A756-0E4046A5B365} = {BF2F381D-E865-43BD-9439-20831B9785DE}
+		{C294097C-8171-4FA2-9C58-11A7FE3BEBDA} = {BF2F381D-E865-43BD-9439-20831B9785DE}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{914279EE-58B1-4B27-BA18-66D988C8DFFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{914279EE-58B1-4B27-BA18-66D988C8DFFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{914279EE-58B1-4B27-BA18-66D988C8DFFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{914279EE-58B1-4B27-BA18-66D988C8DFFA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CE959FC9-5E04-4F29-96B5-454BF3E76306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CE959FC9-5E04-4F29-96B5-454BF3E76306}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CE959FC9-5E04-4F29-96B5-454BF3E76306}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CE959FC9-5E04-4F29-96B5-454BF3E76306}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB57F978-2BA8-4BF3-A755-A032030974A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB57F978-2BA8-4BF3-A755-A032030974A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB57F978-2BA8-4BF3-A755-A032030974A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB57F978-2BA8-4BF3-A755-A032030974A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B451E08-E47D-42A3-AD91-8C697A311759}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B451E08-E47D-42A3-AD91-8C697A311759}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B451E08-E47D-42A3-AD91-8C697A311759}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B451E08-E47D-42A3-AD91-8C697A311759}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE086FBB-952B-491A-A59C-733C33682562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE086FBB-952B-491A-A59C-733C33682562}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE086FBB-952B-491A-A59C-733C33682562}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DE086FBB-952B-491A-A59C-733C33682562}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F33730C-497E-419A-A792-61DB2B936C10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F33730C-497E-419A-A792-61DB2B936C10}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F33730C-497E-419A-A792-61DB2B936C10}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F33730C-497E-419A-A792-61DB2B936C10}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2529A763-7FF2-470F-8B61-B687B739B756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2529A763-7FF2-470F-8B61-B687B739B756}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2529A763-7FF2-470F-8B61-B687B739B756}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2529A763-7FF2-470F-8B61-B687B739B756}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA4BA62E-70F4-4280-A756-0E4046A5B365}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA4BA62E-70F4-4280-A756-0E4046A5B365}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA4BA62E-70F4-4280-A756-0E4046A5B365}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA4BA62E-70F4-4280-A756-0E4046A5B365}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12E52512-1A77-4DE6-BBBC-3EFD0AB04D91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12E52512-1A77-4DE6-BBBC-3EFD0AB04D91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12E52512-1A77-4DE6-BBBC-3EFD0AB04D91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12E52512-1A77-4DE6-BBBC-3EFD0AB04D91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8B26C383-DB8A-4716-9B44-6038C36E370F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8B26C383-DB8A-4716-9B44-6038C36E370F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8B26C383-DB8A-4716-9B44-6038C36E370F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8B26C383-DB8A-4716-9B44-6038C36E370F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{063B8BE1-1713-40FE-BD22-A258FD50108E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{063B8BE1-1713-40FE-BD22-A258FD50108E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{063B8BE1-1713-40FE-BD22-A258FD50108E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{063B8BE1-1713-40FE-BD22-A258FD50108E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C294097C-8171-4FA2-9C58-11A7FE3BEBDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C294097C-8171-4FA2-9C58-11A7FE3BEBDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C294097C-8171-4FA2-9C58-11A7FE3BEBDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C294097C-8171-4FA2-9C58-11A7FE3BEBDA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA3C5AE7-937C-47E1-B861-1F149499889F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA3C5AE7-937C-47E1-B861-1F149499889F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA3C5AE7-937C-47E1-B861-1F149499889F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA3C5AE7-937C-47E1-B861-1F149499889F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{914279EE-58B1-4B27-BA18-66D988C8DFFA} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{CE959FC9-5E04-4F29-96B5-454BF3E76306} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{CB57F978-2BA8-4BF3-A755-A032030974A0} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7B451E08-E47D-42A3-AD91-8C697A311759} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {75205C4D-1F4F-4C65-B827-EE6C4B781DE8}
+		SolutionGuid = {F217C7E2-5993-44CD-B205-72A0167F266F}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
index 1ac5523ca80966..29b2505ef2cb62 100644
--- a/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
+++ b/src/libraries/System.Windows.Extensions/System.Windows.Extensions.sln
@@ -1,60 +1,114 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions.Tests", "tests\System.Windows.Extensions.Tests.csproj", "{AC1A1515-70D8-42E4-9B19-A72F739E974C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{E0C4E267-B1D6-463B-9C95-8C0D3C335924} = {E0C4E267-B1D6-463B-9C95-8C0D3C335924}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{E51D8981-999E-4516-82BF-5766CE531E53}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "src\System.Windows.Extensions.csproj", "{E0C4E267-B1D6-463B-9C95-8C0D3C335924}"
-	ProjectSection(ProjectDependencies) = postProject
-		{36A0298D-E01E-411D-A19B-19EEC60B9A8A} = {36A0298D-E01E-411D-A19B-19EEC60B9A8A}
-	EndProjectSection
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.Registry", "..\Microsoft.Win32.Registry\ref\Microsoft.Win32.Registry.csproj", "{A9027B85-D964-42CC-8275-CDAC13E326D2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "ref\System.Windows.Extensions.csproj", "{36A0298D-E01E-411D-A19B-19EEC60B9A8A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\ref\Microsoft.Win32.SystemEvents.csproj", "{2518617E-3EFC-4CD1-AF86-D7115B5065B0}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Win32.SystemEvents", "..\Microsoft.Win32.SystemEvents\src\Microsoft.Win32.SystemEvents.csproj", "{63747E82-DCD9-445E-A20E-753B1A6D603B}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\ref\System.Drawing.Common.csproj", "{DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common", "..\System.Drawing.Common\src\System.Drawing.Common.csproj", "{532CAA5E-15F7-4E76-9EBC-B08C56390172}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{09BA10C4-8B7A-4713-932F-5439A0964A93}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\ref\System.Runtime.CompilerServices.Unsafe.csproj", "{FD006B85-C406-4F32-8349-038B1CDA1FBA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.CompilerServices.Unsafe", "..\System.Runtime.CompilerServices.Unsafe\src\System.Runtime.CompilerServices.Unsafe.ilproj", "{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.AccessControl", "..\System.Security.AccessControl\ref\System.Security.AccessControl.csproj", "{C10F0726-F415-4502-AA36-F68608CDD020}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Principal.Windows", "..\System.Security.Principal.Windows\ref\System.Security.Principal.Windows.csproj", "{1BCBFD21-119F-47D1-8797-0C735CC6306B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "ref\System.Windows.Extensions.csproj", "{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions", "src\System.Windows.Extensions.csproj", "{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Extensions.Tests", "tests\System.Windows.Extensions.Tests.csproj", "{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AC21A11-4160-46B3-8F6B-76FD4FD3CBF1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{CAA9FD9A-8A4E-40AD-85A2-160762C9C478}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{69E04E17-A14D-4B05-BBD7-12F4E63FE602}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{E51D8981-999E-4516-82BF-5766CE531E53} = {0AC21A11-4160-46B3-8F6B-76FD4FD3CBF1}
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC} = {0AC21A11-4160-46B3-8F6B-76FD4FD3CBF1}
+		{A9027B85-D964-42CC-8275-CDAC13E326D2} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{2518617E-3EFC-4CD1-AF86-D7115B5065B0} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{FD006B85-C406-4F32-8349-038B1CDA1FBA} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{C10F0726-F415-4502-AA36-F68608CDD020} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{1BCBFD21-119F-47D1-8797-0C735CC6306B} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B} = {CAA9FD9A-8A4E-40AD-85A2-160762C9C478}
+		{63747E82-DCD9-445E-A20E-753B1A6D603B} = {69E04E17-A14D-4B05-BBD7-12F4E63FE602}
+		{532CAA5E-15F7-4E76-9EBC-B08C56390172} = {69E04E17-A14D-4B05-BBD7-12F4E63FE602}
+		{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91} = {69E04E17-A14D-4B05-BBD7-12F4E63FE602}
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928} = {69E04E17-A14D-4B05-BBD7-12F4E63FE602}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AC1A1515-70D8-42E4-9B19-A72F739E974C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC1A1515-70D8-42E4-9B19-A72F739E974C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC1A1515-70D8-42E4-9B19-A72F739E974C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC1A1515-70D8-42E4-9B19-A72F739E974C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0C4E267-B1D6-463B-9C95-8C0D3C335924}.Release|Any CPU.Build.0 = Release|Any CPU
-		{36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{36A0298D-E01E-411D-A19B-19EEC60B9A8A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{09BA10C4-8B7A-4713-932F-5439A0964A93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09BA10C4-8B7A-4713-932F-5439A0964A93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{09BA10C4-8B7A-4713-932F-5439A0964A93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09BA10C4-8B7A-4713-932F-5439A0964A93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E51D8981-999E-4516-82BF-5766CE531E53}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9027B85-D964-42CC-8275-CDAC13E326D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9027B85-D964-42CC-8275-CDAC13E326D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9027B85-D964-42CC-8275-CDAC13E326D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A9027B85-D964-42CC-8275-CDAC13E326D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2518617E-3EFC-4CD1-AF86-D7115B5065B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2518617E-3EFC-4CD1-AF86-D7115B5065B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2518617E-3EFC-4CD1-AF86-D7115B5065B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2518617E-3EFC-4CD1-AF86-D7115B5065B0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{63747E82-DCD9-445E-A20E-753B1A6D603B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{63747E82-DCD9-445E-A20E-753B1A6D603B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{63747E82-DCD9-445E-A20E-753B1A6D603B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{63747E82-DCD9-445E-A20E-753B1A6D603B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDAEB258-71D9-4D26-A6A4-67F5CC8D77DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{532CAA5E-15F7-4E76-9EBC-B08C56390172}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FD006B85-C406-4F32-8349-038B1CDA1FBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FD006B85-C406-4F32-8349-038B1CDA1FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FD006B85-C406-4F32-8349-038B1CDA1FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FD006B85-C406-4F32-8349-038B1CDA1FBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEC4B7DB-8F6C-4228-AD22-16BEBC125C91}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C10F0726-F415-4502-AA36-F68608CDD020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C10F0726-F415-4502-AA36-F68608CDD020}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C10F0726-F415-4502-AA36-F68608CDD020}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C10F0726-F415-4502-AA36-F68608CDD020}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1BCBFD21-119F-47D1-8797-0C735CC6306B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1BCBFD21-119F-47D1-8797-0C735CC6306B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1BCBFD21-119F-47D1-8797-0C735CC6306B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1BCBFD21-119F-47D1-8797-0C735CC6306B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFB20E97-6E12-43EA-BA9B-9E8AC0D05C1B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6324EAB4-058A-4D80-8D99-5DFB7AEA8928}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5CE6447B-ECCE-461C-918D-A37A7ACDF2AC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AC1A1515-70D8-42E4-9B19-A72F739E974C} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-		{E0C4E267-B1D6-463B-9C95-8C0D3C335924} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{36A0298D-E01E-411D-A19B-19EEC60B9A8A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{09BA10C4-8B7A-4713-932F-5439A0964A93} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {DC3F0B38-F32E-4F1E-9FC9-B541747AC4F3}
+		SolutionGuid = {26319C28-068C-4C45-9692-D516A03AA6F0}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
index bda1c0aff3f676..033b7036ab6cdd 100644
--- a/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
+++ b/src/libraries/System.Xml.ReaderWriter/System.Xml.ReaderWriter.sln
@@ -1,48 +1,42 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "src\System.Xml.ReaderWriter.csproj", "{C559743A-762E-4D9D-B986-E77BDB97652E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{6F785D18-A969-4DB9-AB45-DD294839087D} = {6F785D18-A969-4DB9-AB45-DD294839087D}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{4886A8C5-3546-459A-8800-ED0DA91C6B15}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "ref\System.Xml.ReaderWriter.csproj", "{6F785D18-A969-4DB9-AB45-DD294839087D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "ref\System.Xml.ReaderWriter.csproj", "{2FE5F437-4CE1-4A27-8547-B950F8043D89}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.ReaderWriter", "src\System.Xml.ReaderWriter.csproj", "{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{46194C7F-6456-4EF8-8D88-98315E7B6418}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{6BF38109-85EC-4409-BFEA-7B2DAB946024}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{DE97B555-0DDC-42D4-98D3-2B00A532B6CF}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{4886A8C5-3546-459A-8800-ED0DA91C6B15} = {46194C7F-6456-4EF8-8D88-98315E7B6418}
+		{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA} = {46194C7F-6456-4EF8-8D88-98315E7B6418}
+		{2FE5F437-4CE1-4A27-8547-B950F8043D89} = {DE97B555-0DDC-42D4-98D3-2B00A532B6CF}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C559743A-762E-4D9D-B986-E77BDB97652E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C559743A-762E-4D9D-B986-E77BDB97652E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C559743A-762E-4D9D-B986-E77BDB97652E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C559743A-762E-4D9D-B986-E77BDB97652E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F785D18-A969-4DB9-AB45-DD294839087D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F785D18-A969-4DB9-AB45-DD294839087D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F785D18-A969-4DB9-AB45-DD294839087D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F785D18-A969-4DB9-AB45-DD294839087D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6BF38109-85EC-4409-BFEA-7B2DAB946024}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6BF38109-85EC-4409-BFEA-7B2DAB946024}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6BF38109-85EC-4409-BFEA-7B2DAB946024}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6BF38109-85EC-4409-BFEA-7B2DAB946024}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4886A8C5-3546-459A-8800-ED0DA91C6B15}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2FE5F437-4CE1-4A27-8547-B950F8043D89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2FE5F437-4CE1-4A27-8547-B950F8043D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2FE5F437-4CE1-4A27-8547-B950F8043D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2FE5F437-4CE1-4A27-8547-B950F8043D89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FA7C251C-D1FD-45C3-8CC8-D094F70A03AA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{C559743A-762E-4D9D-B986-E77BDB97652E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{6F785D18-A969-4DB9-AB45-DD294839087D} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{6BF38109-85EC-4409-BFEA-7B2DAB946024} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D394A911-8F2F-446B-B9F2-6B075160DF6A}
+		SolutionGuid = {B00449BC-6738-4BD0-A908-5DE1002A348C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
index f76ae08202fc71..0326fe7a7b0608 100644
--- a/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
+++ b/src/libraries/System.Xml.XDocument/System.Xml.XDocument.sln
@@ -1,55 +1,49 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XDocument", "src\System.Xml.XDocument.csproj", "{442C5A88-29C2-4B00-B1DF-730D646D3861}"
-	ProjectSection(ProjectDependencies) = postProject
-		{506A8ECB-E5B4-4F10-8419-26A0EC7AB225} = {506A8ECB-E5B4-4F10-8419-26A0EC7AB225}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj", "{09DBC219-3DE1-40E1-ABD2-CD972410F03E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XDocument", "ref\System.Xml.XDocument.csproj", "{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{CE19D781-5542-4024-9829-FE589BA93146}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XDocument", "ref\System.Xml.XDocument.csproj", "{1516AD95-61E7-40F6-A9A8-59A6E8A0467A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XDocument", "src\System.Xml.XDocument.csproj", "{B229C42C-204A-43B4-AB71-587AD46F927E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj", "{C5273844-69B0-429C-92B8-0BBDC5C7562F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0503C121-0F76-4207-86E6-03C409D4DEA4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{B31AAA00-76C3-45EA-9B6F-5996EAFCE73B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{96EF6C6D-D8A4-4410-93FC-951EC70589F3}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{09DBC219-3DE1-40E1-ABD2-CD972410F03E} = {0503C121-0F76-4207-86E6-03C409D4DEA4}
+		{CE19D781-5542-4024-9829-FE589BA93146} = {0503C121-0F76-4207-86E6-03C409D4DEA4}
+		{B229C42C-204A-43B4-AB71-587AD46F927E} = {0503C121-0F76-4207-86E6-03C409D4DEA4}
+		{1516AD95-61E7-40F6-A9A8-59A6E8A0467A} = {96EF6C6D-D8A4-4410-93FC-951EC70589F3}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{442C5A88-29C2-4B00-B1DF-730D646D3861}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{442C5A88-29C2-4B00-B1DF-730D646D3861}.Release|Any CPU.Build.0 = Release|Any CPU
-		{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{506A8ECB-E5B4-4F10-8419-26A0EC7AB225}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5273844-69B0-429C-92B8-0BBDC5C7562F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5273844-69B0-429C-92B8-0BBDC5C7562F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5273844-69B0-429C-92B8-0BBDC5C7562F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5273844-69B0-429C-92B8-0BBDC5C7562F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B31AAA00-76C3-45EA-9B6F-5996EAFCE73B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B31AAA00-76C3-45EA-9B6F-5996EAFCE73B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B31AAA00-76C3-45EA-9B6F-5996EAFCE73B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B31AAA00-76C3-45EA-9B6F-5996EAFCE73B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09DBC219-3DE1-40E1-ABD2-CD972410F03E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09DBC219-3DE1-40E1-ABD2-CD972410F03E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09DBC219-3DE1-40E1-ABD2-CD972410F03E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09DBC219-3DE1-40E1-ABD2-CD972410F03E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE19D781-5542-4024-9829-FE589BA93146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE19D781-5542-4024-9829-FE589BA93146}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE19D781-5542-4024-9829-FE589BA93146}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE19D781-5542-4024-9829-FE589BA93146}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1516AD95-61E7-40F6-A9A8-59A6E8A0467A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1516AD95-61E7-40F6-A9A8-59A6E8A0467A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1516AD95-61E7-40F6-A9A8-59A6E8A0467A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1516AD95-61E7-40F6-A9A8-59A6E8A0467A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B229C42C-204A-43B4-AB71-587AD46F927E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B229C42C-204A-43B4-AB71-587AD46F927E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B229C42C-204A-43B4-AB71-587AD46F927E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B229C42C-204A-43B4-AB71-587AD46F927E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{442C5A88-29C2-4B00-B1DF-730D646D3861} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{506A8ECB-E5B4-4F10-8419-26A0EC7AB225} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{C5273844-69B0-429C-92B8-0BBDC5C7562F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{B31AAA00-76C3-45EA-9B6F-5996EAFCE73B} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7D65CA50-781D-47DB-B000-870C0E0ED32E}
+		SolutionGuid = {E25A5CFF-8135-4023-9954-63B182032639}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln b/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
index f5f7c70e845ad0..f05e56119a8ff4 100644
--- a/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
+++ b/src/libraries/System.Xml.XPath.XDocument/System.Xml.XPath.XDocument.sln
@@ -1,55 +1,49 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument", "src\System.Xml.XPath.XDocument.csproj", "{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F44BEAB4-EDDB-497B-B15C-11E8DFB94092} = {F44BEAB4-EDDB-497B-B15C-11E8DFB94092}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj", "{A03326C2-C437-44C6-91C5-07AA8F24D51C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument", "ref\System.Xml.XPath.XDocument.csproj", "{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{C1BE1D97-D078-4882-A772-C3CA11FD1F73}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument", "ref\System.Xml.XPath.XDocument.csproj", "{E0E5B798-30CC-4D39-B164-C009141E2ABC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath.XDocument", "src\System.Xml.XPath.XDocument.csproj", "{D52C68D2-B6DD-4FFB-B3B5-011B76733202}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{E0E66923-602E-4629-8886-3C8118644D09}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E5B2BE2B-B7CC-4CAB-BF3E-9AFCCA5F8A15}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml.Linq", "..\System.Private.Xml.Linq\src\System.Private.Xml.Linq.csproj", "{0E7066DB-D05A-48C5-ADDD-027FEB658D9C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{83432D9A-61B9-470F-A3EC-AC125DCCFAA9}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{A03326C2-C437-44C6-91C5-07AA8F24D51C} = {E5B2BE2B-B7CC-4CAB-BF3E-9AFCCA5F8A15}
+		{C1BE1D97-D078-4882-A772-C3CA11FD1F73} = {E5B2BE2B-B7CC-4CAB-BF3E-9AFCCA5F8A15}
+		{D52C68D2-B6DD-4FFB-B3B5-011B76733202} = {E5B2BE2B-B7CC-4CAB-BF3E-9AFCCA5F8A15}
+		{E0E5B798-30CC-4D39-B164-C009141E2ABC} = {83432D9A-61B9-470F-A3EC-AC125DCCFAA9}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F44BEAB4-EDDB-497B-B15C-11E8DFB94092}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0E66923-602E-4629-8886-3C8118644D09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0E66923-602E-4629-8886-3C8118644D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0E66923-602E-4629-8886-3C8118644D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0E66923-602E-4629-8886-3C8118644D09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0E7066DB-D05A-48C5-ADDD-027FEB658D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0E7066DB-D05A-48C5-ADDD-027FEB658D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0E7066DB-D05A-48C5-ADDD-027FEB658D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0E7066DB-D05A-48C5-ADDD-027FEB658D9C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A03326C2-C437-44C6-91C5-07AA8F24D51C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A03326C2-C437-44C6-91C5-07AA8F24D51C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A03326C2-C437-44C6-91C5-07AA8F24D51C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A03326C2-C437-44C6-91C5-07AA8F24D51C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1BE1D97-D078-4882-A772-C3CA11FD1F73}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E0E5B798-30CC-4D39-B164-C009141E2ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E0E5B798-30CC-4D39-B164-C009141E2ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E0E5B798-30CC-4D39-B164-C009141E2ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E0E5B798-30CC-4D39-B164-C009141E2ABC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D52C68D2-B6DD-4FFB-B3B5-011B76733202}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D52C68D2-B6DD-4FFB-B3B5-011B76733202}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D52C68D2-B6DD-4FFB-B3B5-011B76733202}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D52C68D2-B6DD-4FFB-B3B5-011B76733202}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{DAA1EA56-C318-4D2E-AB8D-1AB87D9F98F5} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{F44BEAB4-EDDB-497B-B15C-11E8DFB94092} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{E0E66923-602E-4629-8886-3C8118644D09} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{0E7066DB-D05A-48C5-ADDD-027FEB658D9C} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {895DF830-8667-4661-9AA4-E7F9E6C34D73}
+		SolutionGuid = {AC5CC49B-D68E-4B1E-8C4B-ECBE2F5E3AED}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
index 7d64e68551107b..9aa6a12b9b350d 100644
--- a/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
+++ b/src/libraries/System.Xml.XPath/System.Xml.XPath.sln
@@ -1,48 +1,42 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "src\System.Xml.XPath.csproj", "{783F801D-50DE-45B1-B8BE-C36A1F5049F1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A3B3FF23-D123-4F5A-8618-5128B18987C5} = {A3B3FF23-D123-4F5A-8618-5128B18987C5}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{B7D48F78-4580-4398-A93F-FD02A15AD0BD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "ref\System.Xml.XPath.csproj", "{A3B3FF23-D123-4F5A-8618-5128B18987C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "ref\System.Xml.XPath.csproj", "{38040AE0-59E4-46CE-861D-A33A383BB0FC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XPath", "src\System.Xml.XPath.csproj", "{F825C114-FF6D-4826-BC8A-586246369695}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BB1DEC66-E05D-414F-974B-6287EE7CB9CF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{A7BF3BB6-1D0A-431F-A4E6-135E6257EDCE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F6E1C6DF-ADD6-4634-88E1-A51872A1CF96}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{B7D48F78-4580-4398-A93F-FD02A15AD0BD} = {BB1DEC66-E05D-414F-974B-6287EE7CB9CF}
+		{F825C114-FF6D-4826-BC8A-586246369695} = {BB1DEC66-E05D-414F-974B-6287EE7CB9CF}
+		{38040AE0-59E4-46CE-861D-A33A383BB0FC} = {F6E1C6DF-ADD6-4634-88E1-A51872A1CF96}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{783F801D-50DE-45B1-B8BE-C36A1F5049F1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A3B3FF23-D123-4F5A-8618-5128B18987C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A3B3FF23-D123-4F5A-8618-5128B18987C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A3B3FF23-D123-4F5A-8618-5128B18987C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A3B3FF23-D123-4F5A-8618-5128B18987C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A7BF3BB6-1D0A-431F-A4E6-135E6257EDCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A7BF3BB6-1D0A-431F-A4E6-135E6257EDCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A7BF3BB6-1D0A-431F-A4E6-135E6257EDCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A7BF3BB6-1D0A-431F-A4E6-135E6257EDCE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7D48F78-4580-4398-A93F-FD02A15AD0BD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{38040AE0-59E4-46CE-861D-A33A383BB0FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{38040AE0-59E4-46CE-861D-A33A383BB0FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{38040AE0-59E4-46CE-861D-A33A383BB0FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{38040AE0-59E4-46CE-861D-A33A383BB0FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F825C114-FF6D-4826-BC8A-586246369695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F825C114-FF6D-4826-BC8A-586246369695}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F825C114-FF6D-4826-BC8A-586246369695}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F825C114-FF6D-4826-BC8A-586246369695}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{783F801D-50DE-45B1-B8BE-C36A1F5049F1} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{A3B3FF23-D123-4F5A-8618-5128B18987C5} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{A7BF3BB6-1D0A-431F-A4E6-135E6257EDCE} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D9A010CC-3ADD-49CA-8F5B-93D3B4C48E97}
+		SolutionGuid = {DF8F269A-6F5E-4DE2-A0D7-6852F6470D4C}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
index 186be500ee2f85..86c14e66335fde 100644
--- a/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
+++ b/src/libraries/System.Xml.XmlDocument/System.Xml.XmlDocument.sln
@@ -1,48 +1,42 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument", "src\System.Xml.XmlDocument.csproj", "{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E} = {DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{733E5502-5F1A-4ECC-8C44-0E057B11437D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument", "ref\System.Xml.XmlDocument.csproj", "{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument", "ref\System.Xml.XmlDocument.csproj", "{9FA44EA8-BEDA-412E-A366-9334FDBA77A9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument", "src\System.Xml.XmlDocument.csproj", "{8656FF2F-1024-4D56-B38C-F99BE27B732D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2AF6C583-07EB-4E6D-9DE0-8DA4ADD98CB4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{7ECF0E1E-ABCA-4E1A-9353-C311279DA82F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{848E7A87-B1DC-41C3-845B-7FCF44C59219}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{733E5502-5F1A-4ECC-8C44-0E057B11437D} = {2AF6C583-07EB-4E6D-9DE0-8DA4ADD98CB4}
+		{8656FF2F-1024-4D56-B38C-F99BE27B732D} = {2AF6C583-07EB-4E6D-9DE0-8DA4ADD98CB4}
+		{9FA44EA8-BEDA-412E-A366-9334FDBA77A9} = {848E7A87-B1DC-41C3-845B-7FCF44C59219}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EC0F9F33-3D4E-470A-90E6-AE9D005F023A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7ECF0E1E-ABCA-4E1A-9353-C311279DA82F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7ECF0E1E-ABCA-4E1A-9353-C311279DA82F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7ECF0E1E-ABCA-4E1A-9353-C311279DA82F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7ECF0E1E-ABCA-4E1A-9353-C311279DA82F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{733E5502-5F1A-4ECC-8C44-0E057B11437D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FA44EA8-BEDA-412E-A366-9334FDBA77A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FA44EA8-BEDA-412E-A366-9334FDBA77A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FA44EA8-BEDA-412E-A366-9334FDBA77A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FA44EA8-BEDA-412E-A366-9334FDBA77A9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8656FF2F-1024-4D56-B38C-F99BE27B732D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8656FF2F-1024-4D56-B38C-F99BE27B732D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8656FF2F-1024-4D56-B38C-F99BE27B732D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8656FF2F-1024-4D56-B38C-F99BE27B732D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EC0F9F33-3D4E-470A-90E6-AE9D005F023A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{DFF03D7C-82DF-4E4C-A722-2EFFD844DA7E} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{7ECF0E1E-ABCA-4E1A-9353-C311279DA82F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {6A00ACB9-4345-4301-9AEE-A34D09CB1E42}
+		SolutionGuid = {61A561C5-14D4-487B-B5CF-940E55806DBF}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
index 66c1ae3cef2316..2ebc4ee0007709 100644
--- a/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
+++ b/src/libraries/System.Xml.XmlSerializer/System.Xml.XmlSerializer.sln
@@ -1,48 +1,42 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27213.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer", "src\System.Xml.XmlSerializer.csproj", "{D62A6082-5229-4845-8BE9-75753E08C65A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3F7C5D50-7CDA-44EF-BB05-912D496BAA46} = {3F7C5D50-7CDA-44EF-BB05-912D496BAA46}
-	EndProjectSection
+Microsoft Visual Studio Solution File, Format Version 12.00
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer", "ref\System.Xml.XmlSerializer.csproj", "{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer", "ref\System.Xml.XmlSerializer.csproj", "{A463D0F1-1814-4276-B7A9-59780C755D0A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E107E9C1-E893-4E87-987E-04EF0DCEAEFD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer", "src\System.Xml.XmlSerializer.csproj", "{67D79968-DF22-4273-B2FA-D3EEC905095C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2E666815-2EDB-464B-9DF6-380BF4789AD4}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8737C3AD-DAEC-43CA-935F-1211164262F1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.Xml", "..\System.Private.Xml\src\System.Private.Xml.csproj", "{D8D6D6CD-3014-4D0D-8DD7-DFCFB49FE58E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{10671B07-C5EE-43EF-80A2-44124A196835}"
 EndProject
 Global
+	GlobalSection(NestedProjects) = preSolution
+		{EF514C0C-ECA7-419A-BDED-A6735FEA16F9} = {8737C3AD-DAEC-43CA-935F-1211164262F1}
+		{67D79968-DF22-4273-B2FA-D3EEC905095C} = {8737C3AD-DAEC-43CA-935F-1211164262F1}
+		{A463D0F1-1814-4276-B7A9-59780C755D0A} = {10671B07-C5EE-43EF-80A2-44124A196835}
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D62A6082-5229-4845-8BE9-75753E08C65A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D62A6082-5229-4845-8BE9-75753E08C65A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D62A6082-5229-4845-8BE9-75753E08C65A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D62A6082-5229-4845-8BE9-75753E08C65A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F7C5D50-7CDA-44EF-BB05-912D496BAA46}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D8D6D6CD-3014-4D0D-8DD7-DFCFB49FE58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D8D6D6CD-3014-4D0D-8DD7-DFCFB49FE58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D8D6D6CD-3014-4D0D-8DD7-DFCFB49FE58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D8D6D6CD-3014-4D0D-8DD7-DFCFB49FE58E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF514C0C-ECA7-419A-BDED-A6735FEA16F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A463D0F1-1814-4276-B7A9-59780C755D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A463D0F1-1814-4276-B7A9-59780C755D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A463D0F1-1814-4276-B7A9-59780C755D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A463D0F1-1814-4276-B7A9-59780C755D0A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67D79968-DF22-4273-B2FA-D3EEC905095C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67D79968-DF22-4273-B2FA-D3EEC905095C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67D79968-DF22-4273-B2FA-D3EEC905095C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67D79968-DF22-4273-B2FA-D3EEC905095C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{D62A6082-5229-4845-8BE9-75753E08C65A} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-		{3F7C5D50-7CDA-44EF-BB05-912D496BAA46} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
-		{D8D6D6CD-3014-4D0D-8DD7-DFCFB49FE58E} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5E74729B-F552-4E3F-9B11-3E121D6A83A0}
+		SolutionGuid = {24AD78FE-B27D-46DE-B574-17F4CC6DF7CC}
 	EndGlobalSection
 EndGlobal
diff --git a/src/libraries/UpdateLibrariesSlns.ps1 b/src/libraries/UpdateLibrariesSlns.ps1
new file mode 100644
index 00000000000000..de8ba885b05da6
--- /dev/null
+++ b/src/libraries/UpdateLibrariesSlns.ps1
@@ -0,0 +1,24 @@
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the MIT license.
+
+$ProjContent = @'
+<Project Sdk="Microsoft.Build.Traversal">
+  <PropertyGroup>
+    <IncludeInSolutionFile>false</IncludeInSolutionFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)ref\*.*proj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)src\*.*proj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)tests\**\*.Tests.*proj" />
+  </ItemGroup>
+</Project>
+'@
+
+foreach ($file in Get-ChildItem *\*.sln)
+{
+    $ProjFilePath = "$(Join-Path $file.DirectoryName $file.BaseName).proj"
+
+    $ProjContent | Out-File -FilePath $ProjFilePath
+    dotnet slngen "$ProjFilePath -p SlnGenMainProject=$($file.BaseName) --launch false --nologo"
+    Remove-Item $ProjFilePath
+}
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index 8546ffcaf5f137..e1236419eff106 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -45,6 +45,7 @@
 
     <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes>
     <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
+    <SlnGenSolutionFolder>src</SlnGenSolutionFolder>
   </PropertyGroup>
 
   <!-- Platform specific properties -->